deleted file mode 100644
@@ -1,3 +0,0 @@
-do_enforce_all = true
-do_libc_dev_package = false
-do_doc_package = false
deleted file mode 100755
@@ -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 --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
deleted file mode 100755
@@ -1,30 +0,0 @@
-#!/bin/bash -eu
-
-. debian/debian.env
-
-# Use gzip instead of lz4 for amd64
-sed -i '/CONFIG_KERNEL_LZ4/d' ${DEBIAN}/config/amd64/config.common.amd64
-sed -i '3aCONFIG_KERNEL_GZIP=y\n# CONFIG_KERNEL_LZ4 is not set' ${DEBIAN}/config/amd64/config.common.amd64
-
-# And adjust annotations accordingly
-sed -i "s/CONFIG_KERNEL_LZ4 policy<{'amd64': 'y'}>/CONFIG_KERNEL_LZ4 policy<{'amd64': 'n'}>/" ${DEBIAN}/config/annotations
-sed -i "s/CONFIG_KERNEL_GZIP policy<{'amd64': 'n'}>/CONFIG_KERNEL_GZIP policy<{'amd64': 'y'}>/" ${DEBIAN}/config/annotations
-sed -i "s/CONFIG_KERNEL_XZ policy<{'amd64': 'n'}>/CONFIG_KERNEL_XZ policy<{'amd64': 'n'}>/" ${DEBIAN}/config/annotations
-
-
-# UBUNTU_ODM_DRIVERS is disabled for linux-hwe-5.4 in Bionic. Remove the enforcement
-# for the drivers which depend on it.
-sed -i "/CONFIG_MFD_AHC1EC0 policy<{'amd64': 'm'}>/d" ${DEBIAN}/config/annotations
-sed -i "/CONFIG_SENSORS_AHC1EC0_HWMON policy<{'amd64': 'm'}>/d" ${DEBIAN}/config/annotations
-sed -i "/CONFIG_AHC1EC0_WDT policy<{'amd64': 'm'}>/d" ${DEBIAN}/config/annotations
-
-# 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_odm_drivers = false
-EOD
-
BugLink: https://bugs.launchpad.net/bugs/2077306 Remove debian.ibm/rules.d/hooks.mk which only contains obsolete build flags. In fact, this file is a left-over from when the packaging files were copied. It's a file that is generated by local-mangle and copy-files which are only used for backports, which this kernel is not. Removet it all, it's unneeded, incorrect and stale. Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> --- debian.ibm/rules.d/hooks.mk | 3 -- debian.ibm/scripts/helpers/copy-files | 62 ------------------------- debian.ibm/scripts/helpers/local-mangle | 30 ------------ 3 files changed, 95 deletions(-) delete mode 100644 debian.ibm/rules.d/hooks.mk delete mode 100755 debian.ibm/scripts/helpers/copy-files delete mode 100755 debian.ibm/scripts/helpers/local-mangle