[SRU][N:lowlatency][PATCH 2/4] UBUNTU: [Packaging] lowlatency: Remove backport packaging files

Mon Oct 21 14:24:22 UTC 2024

On Mon, 21 Oct 2024 15:33:26 +0200
Stefan Bader <stefan.bader at canonical.com> wrote:

> On 21.10.24 14:26, Juerg Haefliger wrote:
> > BugLink: https://bugs.launchpad.net/bugs/2080970
> > 
> > This is not a backported kernel, so remove all packaging files and
> > scripts associated with backport packaging.
> >   
> 
> I do not think this is correct. To what I know this is a sameport which 
> uses at least hooks.mk, copy-files, and local-mangle!

Hm.

$ cat debian.lowlatency/etc/update.conf 
# WARNING: we do not create update.conf when we are not a
# derivative. Various cranky components make use of this.
# If we start unconditionally creating update.conf we need
# to fix at least cranky close and cranky rebase.
RELEASE_REPO=git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/noble
SOURCE_RELEASE_BRANCH=master-next
DEBIAN_MASTER=debian.master
$

There's no BACKPORT_SUFFIX or BACKPORT_NO_SUFFIX defined in the above file.

And 'cranky open' only calls the helper scripts if any of them is set:

# Run the update script used for backport kernels
if [ -n "$BACKPORT_SUFFIX" ] || [ -n "$BACKPORT_NO_SUFFIX" ]; then
        update_from_master_script="$DEBIAN/scripts/helpers/copy-files"
...
fi

I'm not seeing any references to the helper scripts anywhere else. And if you
look at the content of the removed scripts:
- copy-files wants to sync config.flavour.lowlatency
- local-mangle updates etc/getabis
Old cruft that is no longer present. I think in the old days these helpers
might have been used but not anymore.

...Juerg

> -Stefan
> 
> > Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
> > ---
> >   debian.lowlatency/etc/local.conf              |  1 -
> >   debian.lowlatency/rules.d/hooks.mk            |  6 --
> >   debian.lowlatency/scripts/helpers/copy-files  | 62 -------------------
> >   .../scripts/helpers/local-mangle              | 24 -------
> >   4 files changed, 93 deletions(-)
> >   delete mode 100644 debian.lowlatency/etc/local.conf
> >   delete mode 100644 debian.lowlatency/rules.d/hooks.mk
> >   delete mode 100755 debian.lowlatency/scripts/helpers/copy-files
> >   delete mode 100755 debian.lowlatency/scripts/helpers/local-mangle
> > 
> > diff --git a/debian.lowlatency/etc/local.conf b/debian.lowlatency/etc/local.conf
> > deleted file mode 100644
> > index 453a234e64db..000000000000
> > --- a/debian.lowlatency/etc/local.conf
> > +++ /dev/null
> > @@ -1 +0,0 @@
> > -FOREIGN_ARCHES="armhf ppc64el s390x"
> > diff --git a/debian.lowlatency/rules.d/hooks.mk b/debian.lowlatency/rules.d/hooks.mk
> > deleted file mode 100644
> > index 3d2580d7a4c8..000000000000
> > --- a/debian.lowlatency/rules.d/hooks.mk
> > +++ /dev/null
> > @@ -1,6 +0,0 @@
> > -do_enforce_all = true
> > -do_libc_dev_package	= false
> > -do_doc_package		= false
> > -do_tools_common		= false
> > -do_tools_host		= false
> > -do_source_package	= false
> > diff --git a/debian.lowlatency/scripts/helpers/copy-files b/debian.lowlatency/scripts/helpers/copy-files
> > deleted file mode 100755
> > index c80862fbf605..000000000000
> > --- a/debian.lowlatency/scripts/helpers/copy-files
> > +++ /dev/null
> > @@ -1,62 +0,0 @@
> > -#!/bin/bash -eu
> > -
> > -if [ -f debian/debian.env ]; then
> > -	# shellcheck disable=SC1091
> > -	. debian/debian.env
> > -fi
> > -
> > -if [ ! -d "${DEBIAN}" ]; then
> > -	echo You must run this script from the top directory of this repository.
> > -	exit 1
> > -fi
> > -
> > -CONF="${DEBIAN}"/etc/update.conf
> > -if [ -f "${CONF}" ]; then
> > -	# shellcheck disable=SC1090
> > -	. "${CONF}"
> > -fi
> > -
> > -FOREIGN_ARCHES=""
> > -LOCAL_CONF="${DEBIAN}/etc/local.conf"
> > -if [ -f "${LOCAL_CONF}" ]; then
> > -	# shellcheck disable=SC1090
> > -	. "${LOCAL_CONF}"
> > -fi
> > -
> > -SKIP_RULES_D=${SKIP_RULES_D:-}
> > -
> > -#
> > -# Update configs from master
> > -#
> > -rsync -avc --exclude 'annotations' --exclude 'config.flavour.lowlatency' --exclude 'config.flavour.lowlatency-64k' --delete "${DEBIAN_MASTER}/config/" "${DEBIAN}/config"
> > -
> > -#
> > -# Update package and DTB settings from master.
> > -#
> > -if [ -z "${SKIP_RULES_D}" ] ; then
> > -	rsync -avc "${DEBIAN_MASTER}/rules.d/"*.mk "${DEBIAN}/rules.d/"
> > -fi
> > -
> > -# Remove the .mk files from the arch's that are not supported
> > -for i in ${FOREIGN_ARCHES}
> > -do
> > -	rm -f "${DEBIAN}/rules.d/${i}.mk"
> > -	git rm -f --ignore-unmatch "${DEBIAN}/rules.d/${i}.mk" || true
> > -done
> > -
> > -#
> > -# Update modprobe.d from master
> > -#
> > -# Some releases (trusty) don't have this directory, and rsync would fail
> > -# without this check.
> > -if [ -d "${DEBIAN}/modprobe.d/" ]; then
> > -	rsync -avc --delete "${DEBIAN_MASTER}/modprobe.d/" "${DEBIAN}/modprobe.d"
> > -fi
> > -
> > -cp -p "${DEBIAN_MASTER}/control.d/"*.inclusion-list "${DEBIAN}/control.d"
> > -
> > -cp -p "${DEBIAN_MASTER}/reconstruct" "${DEBIAN}/reconstruct"
> > -
> > -if [ -x "${DEBIAN}/scripts/helpers/local-mangle" ]; then
> > -	"./${DEBIAN}/scripts/helpers/local-mangle"
> > -fi
> > diff --git a/debian.lowlatency/scripts/helpers/local-mangle b/debian.lowlatency/scripts/helpers/local-mangle
> > deleted file mode 100755
> > index 4fbed2506102..000000000000
> > --- a/debian.lowlatency/scripts/helpers/local-mangle
> > +++ /dev/null
> > @@ -1,24 +0,0 @@
> > -#!/bin/bash -eu
> > -
> > -. debian/debian.env
> > -
> > -# We only build the lowlatency/lowlatency-64k flavours
> > -sed -i '/^flavours.*$/d' ${DEBIAN}/rules.d/amd64.mk
> > -sed -i '/^flavours.*$/d' ${DEBIAN}/rules.d/arm64.mk
> > -echo -e "flavours\t= lowlatency" >> ${DEBIAN}/rules.d/amd64.mk
> > -echo -e "flavours\t= lowlatency lowlatency-64k" >> ${DEBIAN}/rules.d/arm64.mk
> > -
> > -# We only care about lowlatency/lowlatency-64k abis
> > -sed -i /getall/d ${DEBIAN}/etc/getabis
> > -echo "getall amd64 lowlatency" >> ${DEBIAN}/etc/getabis
> > -echo "getall arm64 lowlatency lowlatency-64k" >> ${DEBIAN}/etc/getabis
> > -
> > -# Override options in rules.d/hooks.mk (normally master does not have this
> > -# file but it got added for generic annotations enforcement.
> > -cat <<EOD >>${DEBIAN}/rules.d/hooks.mk
> > -do_libc_dev_package	= false
> > -do_doc_package		= false
> > -do_tools_common		= false
> > -do_tools_host		= false
> > -do_source_package	= false
> > -EOD  
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20241021/ae43ff47/attachment.sig>