From patchwork Mon Aug 19 10:13:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1973770 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WnT3C1fRcz1yg2 for ; Mon, 19 Aug 2024 20:14:14 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sfzOp-0002Ih-FL; Mon, 19 Aug 2024 10:14:07 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sfzOn-0002Hn-56 for kernel-team@lists.ubuntu.com; Mon, 19 Aug 2024 10:14:05 +0000 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id B47463F2EF for ; Mon, 19 Aug 2024 10:14:04 +0000 (UTC) Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-428e48612acso46204335e9.3 for ; Mon, 19 Aug 2024 03:14:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724062444; x=1724667244; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nwtyqnjp7hI5rmX1Bqckx7YzlYkQp1JoV7EOmvee2lo=; b=qOfY+1WeOHWCehQOQLwycloNwGdPGKRxmVB3OfwAeynzlEJVlPvn2lXC4nMOY3Busv Mny2H9sXOecoe1/BMOXIaxA55CEAPDn5JurOqBobqXjRKj7HgYnjTzU6LA4w2kSDCNxI IGjf9BIdbJquIXFZVZeWf07WAp7l8AEvRRmw5H9agg6LcvjS+5ga+4whD08SpBbquQ2m 4S07Tijh9guTAnDPWTI8eyMS8PsNCMN1hH1zTptYmvY7XwWtTTGUI1US3yGIVQSUK42O gYCMJF8FNLF266eVMHdRoOBkMLtS4qHVJJGMDlHqYQWk4pOYCbhIwhHv3AlITKCe52yL 1+2w== X-Gm-Message-State: AOJu0YzlW57kyRGSHcBYDq3otlgHLtqYzJajVDypbdnnRBAo3NOiwa6b +YvngcjtoBZoTdtYA4gAL2ob5j+VykLUPQcs1OdTbRHt1aMOCHoabyROehB9CySVY5TTT2z96R5 aKh7CGqW7BlnmfLrEPgkh2zb4DEx2mcSY+W7IarMfBAdgFpdby9vuTSP/Tol6+ukQ3Qbld48Zoc yyL/efZjQ4PA== X-Received: by 2002:a05:600c:4fd5:b0:426:63f1:9a1b with SMTP id 5b1f17b1804b1-429ed7f4501mr80452065e9.33.1724062444224; Mon, 19 Aug 2024 03:14:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGWzvmLL8bA5jdti0wTc17BeLh/4kdPmbEvaeDKATYtnhXmpYhCvJmnwUOK12OzYprMngMnEA== X-Received: by 2002:a05:600c:4fd5:b0:426:63f1:9a1b with SMTP id 5b1f17b1804b1-429ed7f4501mr80451775e9.33.1724062443539; Mon, 19 Aug 2024 03:14:03 -0700 (PDT) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429ed650402sm106377665e9.11.2024.08.19.03.14.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 03:14:03 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][N:ibm][PATCH 3/3] UBUNTU: [Packaging] ibm: Remove obsolete do_* build flags Date: Mon, 19 Aug 2024 12:13:57 +0200 Message-ID: <20240819101357.35376-4-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240819101357.35376-1-juerg.haefliger@canonical.com> References: <20240819101357.35376-1-juerg.haefliger@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 --- 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 diff --git a/debian.ibm/rules.d/hooks.mk b/debian.ibm/rules.d/hooks.mk deleted file mode 100644 index c16f67ec1294..000000000000 --- a/debian.ibm/rules.d/hooks.mk +++ /dev/null @@ -1,3 +0,0 @@ -do_enforce_all = true -do_libc_dev_package = false -do_doc_package = false diff --git a/debian.ibm/scripts/helpers/copy-files b/debian.ibm/scripts/helpers/copy-files deleted file mode 100755 index 8b40afd31712..000000000000 --- a/debian.ibm/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 --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.ibm/scripts/helpers/local-mangle b/debian.ibm/scripts/helpers/local-mangle deleted file mode 100755 index a4e812e05e78..000000000000 --- a/debian.ibm/scripts/helpers/local-mangle +++ /dev/null @@ -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 <>${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 -