ACK: [Noble/Unstable][PATCH 4/6] UBUNTU: [Packaging] Remove old linux-libc-dev version hack

Masahiro Yamada masahiro.yamada at canonical.com
Mon Dec 4 16:53:23 UTC 2023


On Fri, Nov 24, 2023 at 10:31 PM Juerg Haefliger
<juerg.haefliger at canonical.com> wrote:
>
> Back in the 2.6.35 days, there was some broken linux-libc-dev
> package versioning that needed to be hacked around. Finally
> get rid of it 13 years later...
>
> Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>


Acked-by: Masahiro Yamada <masahiro.yamada at canonical.com>

> ---
>  debian/rules.d/0-common-vars.mk | 12 ------------
>  debian/rules.d/1-maintainer.mk  |  1 -
>  2 files changed, 13 deletions(-)
>
> diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
> index 0c9df2b35893..4e376c3f82ed 100644
> --- a/debian/rules.d/0-common-vars.mk
> +++ b/debian/rules.d/0-common-vars.mk
> @@ -66,18 +66,6 @@ ifneq ($(do_full_build),false)
>    uploadnum    := $(uploadnum)-Ubuntu
>  endif
>
> -# XXX: linux-libc-dev got bumped to -803.N inadvertantly by a ti-omap4 upload
> -#      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
> -
>  DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
>  DEB_HOST_GNU_TYPE  = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
>  DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
> diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
> index 820c14139947..a5ea2241be79 100644
> --- a/debian/rules.d/1-maintainer.mk
> +++ b/debian/rules.d/1-maintainer.mk
> @@ -49,7 +49,6 @@ printenv:
>         @echo "hdr_pkg_name              = $(hdrs_pkg_name)"
>         @echo "rust_pkg_name             = $(rust_pkg_name)"
>         @echo "doc_pkg_name              = $(doc_pkg_name)"
> -       @echo "libc_dev_version          = $(libc_dev_version)"
>         @echo "ubuntu_selftests          = $(ubuntu_selftests)"
>         @echo "arch                      = $(arch)"
>         @echo "kmake                     = $(kmake)"
> --
> 2.40.1
>
>
> --
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team



More information about the kernel-team mailing list