[PATCH 1/2] UBUNTU: bodge linux-libc-dev package version due to ti-omap4 error

[Bryan Wu]

On Tue, Sep 14, 2010 at 2:45 AM, Andy Whitcroft <apw at canonical.com> wrote:
> The ti-omap4 2.6.35-803.8 upload inadvertantly emitted a linux-libc-dev

I think it is 2.6.35-903.8.

> at this version.  This is far in the future compared to the master
> branch leading to binary upload failures for armel when uploading
> master.
>
> Add a 2.6.35 and master branch specific bodge to bump the ABI number up
> by 1000 just for the linux-libc-dev package.
>
> Signed-off-by: Andy Whitcroft <apw at canonical.com>
> ---
>  debian/rules.d/0-common-vars.mk |   12 ++++++++++++
>  debian/rules.d/1-maintainer.mk  |    1 +
>  debian/rules.d/2-binary-arch.mk |    2 +-
>  3 files changed, 14 insertions(+), 1 deletions(-)
>
> diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
> index 2880576..e03fa14 100644
> --- a/debian/rules.d/0-common-vars.mk
> +++ b/debian/rules.d/0-common-vars.mk
> @@ -79,6 +79,18 @@ ifneq ($(full_build),false)
>   uploadnum    := $(uploadnum)-Ubuntu
>  endif
>
> +# XXX: linux-libc-dev got bumped to -803.N inadvertantly by a ti-omap4 upload

-903.N?

> +#      shift our version higher for this package only.  Ensure this only
> +#      occurs for the v2.6.35 kernel so that we do not propogate this into
> +#      any other series.
> +raw_uploadnum  := $(shell echo $(revision) | sed -e 's/.*\.//')
> +libc_dev_version :=
> +ifeq ($(DEBIAN),debian.master)
> +ifeq ($(release),2.6.35)
> +libc_dev_version := -v$(release)-$(shell expr "$(abinum)" + 1000).$(raw_uploadnum)
> +endif
> +endif
> +
>  # We force the sublevel to be exactly what we want. The actual source may
>  # be an in development git tree. We want to force it here instead of
>  # committing changes to the top level Makefile
> diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
> index 4443274..7ad68dd 100644
> --- a/debian/rules.d/1-maintainer.mk
> +++ b/debian/rules.d/1-maintainer.mk
> @@ -108,6 +108,7 @@ endif
>        @echo "do_full_source            = $(do_full_source)"
>        @echo "do_tools                  = $(do_tools)"
>        @echo "full_build                = $(full_build)"
> +       @echo "libc_dev_version          = $(libc_dev_version)"
>
>  printchanges:
>        @baseCommit=$$(git log --pretty=format:'%H %s' | \
> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index 16656c0..e4a4f3c 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -255,7 +255,7 @@ ifeq ($(do_libc_dev_package),true)
>        dh_compress -plinux-libc-dev
>        dh_fixperms -plinux-libc-dev
>        dh_installdeb -plinux-libc-dev
> -       dh_gencontrol -plinux-libc-dev
> +       dh_gencontrol -plinux-libc-dev -- $(libc_dev_version)
>        dh_md5sums -plinux-libc-dev
>        dh_builddeb -plinux-libc-dev
>  endif
> --
> 1.7.0.4
>
>
> --
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>

Thanks,
-- 
Bryan Wu <bryan.wu at canonical.com>
Kernel Developer    +86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd.      www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com