[PATCH] deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb

[PATCH] deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb

[maximilian attems]

userland dev likes latest incarnation of that userland API.
make it easy to also build it on make deb-pkg invocation:

dpkg-deb: building package `linux-libc-dev' in `../linux-libc-dev_2.6.32-rc6-4_amd64.deb'.

Signed-off-by: maximilian attems <max@stro.at>
---
 scripts/package/builddeb |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 8b357b0..fbd1994 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -38,17 +38,20 @@ else
 fi
 tmpdir="$objtree/debian/tmp"
 fwdir="$objtree/debian/fwtmp"
+headerdir="$objtree/debian/headertmp"
 packagename=linux-image-$version
 fwpackagename=linux-firmware-image
+headerpackagename=linux-libc-dev
 
 if [ "$ARCH" = "um" ] ; then
 	packagename=user-mode-linux-$version
 fi
 
 # Setup the directory structure
-rm -rf "$tmpdir" "$fwdir"
+rm -rf "$tmpdir" "$fwdir" "$headerdir"
 mkdir -p "$tmpdir/DEBIAN" "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
 mkdir -p "$fwdir/DEBIAN" "$fwdir/lib" "$fwdir/usr/share/doc/$fwpackagename"
+mkdir -p "$headerdir/DEBIAN" "$headerdir/usr" "$headerdir/usr/share/doc/$headerpackagename"
 if [ "$ARCH" = "um" ] ; then
 	mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin"
 fi
@@ -77,6 +80,9 @@ if grep -q '^CONFIG_MODULES=y' .config ; then
 	fi
 fi
 
+make headers_check
+make headers_install INSTALL_HDR_PATH="$headerdir/usr" 
+
 # Install the maintainer scripts
 # Note: hook scripts under /etc/kernel are also executed by official Debian
 # kernel packages, as well as kernel packages built using make-kpkg
@@ -198,6 +204,18 @@ EOF
 	create_package "$fwpackagename" "$fwdir"
 fi
 
+cat <<EOF >> debian/control
+
+Package: $headerpackagename
+Section: devel
+Provides: linux-kernel-headers
+Architecture: any
+Description: Linux support headers for userspace development
+ This package provides userspaces headers from the Linux kernel.  These headers
+ are used by the installed headers for GNU glibc and other system libraries.
+EOF
+
+create_package "$headerpackagename" "$headerdir"
 create_package "$packagename" "$tmpdir"
 
 exit 0
-- 
1.5.6.5

Re: [PATCH] deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb

[maximilian attems]

> +make headers_install INSTALL_HDR_PATH="$headerdir/usr" 

one nitpick on that target is that it adds strange files too:
./usr/include/.install
./usr/include/..install.cmd

in allmost any dir.

Re: [PATCH] deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb

[Frans Pop]

maximilian attems wrote:
> userland dev likes latest incarnation of that userland API.
> make it easy to also build it on make deb-pkg invocation:
>
> dpkg-deb: building package `linux-libc-dev' in
> `../linux-libc-dev_2.6.32-rc6-4_amd64.deb'.

I would very much prefer it if this was either optional or a separate 
target. I have personally never had any need for such a package and would 
like to be able to not build it.

I agree it should be possible, just not forced.

Cheers,
FJP

Re: [PATCH] deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb

[maximilian attems]

On Thu, Nov 05, 2009 at 12:19:59AM +0100, Frans Pop wrote:
> maximilian attems wrote:
> > userland dev likes latest incarnation of that userland API.
> > make it easy to also build it on make deb-pkg invocation:
> >
> > dpkg-deb: building package `linux-libc-dev' in
> > `../linux-libc-dev_2.6.32-rc6-4_amd64.deb'.
> 
> I would very much prefer it if this was either optional or a separate 
> target. I have personally never had any need for such a package and would 
> like to be able to not build it.
> 
> I agree it should be possible, just not forced.

so what you propose a bindeb-pkg target for the linux-image only?

there is clearly demand for linux-source and linux-headers packages
build out of deb-pkg.

Re: [PATCH] deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb

[Frans Pop]

On Thursday 05 November 2009, maximilian attems wrote:
> On Thu, Nov 05, 2009 at 12:19:59AM +0100, Frans Pop wrote:
> > maximilian attems wrote:
> > > userland dev likes latest incarnation of that userland API.
> > > make it easy to also build it on make deb-pkg invocation:
> >
> > I would very much prefer it if this was either optional or a separate
> > target. I have personally never had any need for such a package and
> > would like to be able to not build it.
> >
> > I agree it should be possible, just not forced.
>
> so what you propose a bindeb-pkg target for the linux-image only?

Yep, that would be fine as a solution and consistent with the targets for 
rpm. Probably bindeb-pkg should do image + firmware though?

> there is clearly demand for linux-source and linux-headers packages
> build out of deb-pkg.

No disagreement with that.

Cheers,
FJP

[PATCH] deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb

[maximilian attems]

userland dev likes latest incarnation of that userland API.
make it easy to also build it on make deb-pkg invocation:

dpkg-deb: building package `linux-libc-dev' in `../linux-libc-dev_2.6.32-rc6-4_amd64.deb'.

Last year patch rebased on top of latest deb-pkg changes.

Signed-off-by: maximilian attems <max@stro.at>
---
 scripts/package/builddeb |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 5fc1e6f..8c1f8d4 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -77,20 +77,24 @@ fi
 tmpdir="$objtree/debian/tmp"
 fwdir="$objtree/debian/fwtmp"
 hdrdir="$objtree/debian/hdrtmp"
+headerdir="$objtree/debian/headertmp"
 packagename=linux-image-$version
 fwpackagename=linux-firmware-image
 hdrpackagename=linux-headers-$version
+headerpackagename=linux-libc-dev
 
 if [ "$ARCH" = "um" ] ; then
 	packagename=user-mode-linux-$version
 fi
 
 # Setup the directory structure
-rm -rf "$tmpdir" "$fwdir" "$hdrdir"
+rm -rf "$tmpdir" "$fwdir" "$hdrdir" "$headerdir"
 mkdir -m 755 -p "$tmpdir/DEBIAN"
 mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
 mkdir -m 755 -p "$fwdir/DEBIAN"
 mkdir -p "$fwdir/lib" "$fwdir/usr/share/doc/$fwpackagename"
+mkdir -m 755 -p "$headerdir/DEBIAN"
+mkdir -p "$headerdir/usr/share/doc/$headerpackagename"
 if [ "$ARCH" = "um" ] ; then
 	mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin"
 fi
@@ -121,6 +125,9 @@ if grep -q '^CONFIG_MODULES=y' .config ; then
 	fi
 fi
 
+make headers_check
+make headers_install INSTALL_HDR_PATH="$headerdir/usr" 
+
 # Install the maintainer scripts
 # Note: hook scripts under /etc/kernel are also executed by official Debian
 # kernel packages, as well as kernel packages built using make-kpkg
@@ -267,6 +274,18 @@ EOF
 	create_package "$fwpackagename" "$fwdir"
 fi
 
+cat <<EOF >> debian/control
+
+Package: $headerpackagename
+Section: devel
+Provides: linux-kernel-headers
+Architecture: any
+Description: Linux support headers for userspace development
+ This package provides userspaces headers from the Linux kernel.  These headers
+ are used by the installed headers for GNU glibc and other system libraries.
+EOF
+
+create_package "$headerpackagename" "$headerdir"
 create_package "$packagename" "$tmpdir"
 
 exit 0
-- 
1.7.2.3

Re: [PATCH] deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb

[Michal Marek]

On 1.1.2011 16:44, maximilian attems wrote:
> userland dev likes latest incarnation of that userland API.
> make it easy to also build it on make deb-pkg invocation:
> 
> dpkg-deb: building package `linux-libc-dev' in `../linux-libc-dev_2.6.32-rc6-4_amd64.deb'.
> 
> Last year patch rebased on top of latest deb-pkg changes.
> 
> Signed-off-by: maximilian attems <max@stro.at>
> ---
>  scripts/package/builddeb |   21 ++++++++++++++++++++-
>  1 files changed, 20 insertions(+), 1 deletions(-)
> 
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index 5fc1e6f..8c1f8d4 100644
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -77,20 +77,24 @@ fi
>  tmpdir="$objtree/debian/tmp"
>  fwdir="$objtree/debian/fwtmp"
>  hdrdir="$objtree/debian/hdrtmp"
> +headerdir="$objtree/debian/headertmp"
>  packagename=linux-image-$version
>  fwpackagename=linux-firmware-image
>  hdrpackagename=linux-headers-$version
> +headerpackagename=linux-libc-dev

hdrpackagename and headerpackagename aren't exactly intuitive names.
What about kernel_headers_package and libc_headers_package?

Michal
>  
>  if [ "$ARCH" = "um" ] ; then
>  	packagename=user-mode-linux-$version
>  fi
>  
>  # Setup the directory structure
> -rm -rf "$tmpdir" "$fwdir" "$hdrdir"
> +rm -rf "$tmpdir" "$fwdir" "$hdrdir" "$headerdir"
>  mkdir -m 755 -p "$tmpdir/DEBIAN"
>  mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
>  mkdir -m 755 -p "$fwdir/DEBIAN"
>  mkdir -p "$fwdir/lib" "$fwdir/usr/share/doc/$fwpackagename"
> +mkdir -m 755 -p "$headerdir/DEBIAN"
> +mkdir -p "$headerdir/usr/share/doc/$headerpackagename"
>  if [ "$ARCH" = "um" ] ; then
>  	mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin"
>  fi
> @@ -121,6 +125,9 @@ if grep -q '^CONFIG_MODULES=y' .config ; then
>  	fi
>  fi
>  
> +make headers_check
> +make headers_install INSTALL_HDR_PATH="$headerdir/usr" 
> +
>  # Install the maintainer scripts
>  # Note: hook scripts under /etc/kernel are also executed by official Debian
>  # kernel packages, as well as kernel packages built using make-kpkg
> @@ -267,6 +274,18 @@ EOF
>  	create_package "$fwpackagename" "$fwdir"
>  fi
>  
> +cat <<EOF >> debian/control
> +
> +Package: $headerpackagename
> +Section: devel
> +Provides: linux-kernel-headers
> +Architecture: any
> +Description: Linux support headers for userspace development
> + This package provides userspaces headers from the Linux kernel.  These headers
> + are used by the installed headers for GNU glibc and other system libraries.
> +EOF
> +
> +create_package "$headerpackagename" "$headerdir"
>  create_package "$packagename" "$tmpdir"
>  
>  exit 0

Re: [PATCH] deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb

[maximilian attems]

On Fri, Jan 07, 2011 at 03:02:27PM +0100, Michal Marek wrote:
> 
> hdrpackagename and headerpackagename aren't exactly intuitive names.
> What about kernel_headers_package and libc_headers_package?
> 

ack, sent patch on top of that one to fix both and the dir names.

thanks.

-- 
maks

Re: [PATCH] deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb

[Michal Marek]

On Fri, Jan 07, 2011 at 03:15:13PM +0000, maximilian attems wrote:
> On Fri, Jan 07, 2011 at 03:02:27PM +0100, Michal Marek wrote:
> > 
> > hdrpackagename and headerpackagename aren't exactly intuitive names.
> > What about kernel_headers_package and libc_headers_package?
> > 
> 
> ack, sent patch on top of that one to fix both and the dir names.

OK, applied both to kbuild-2.6.git#packaging.

Michal