From patchwork Mon Aug 19 10:13:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1973772 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 4WnT3C3jPNz23Rm 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 1sfzOn-0002Ho-5D; Mon, 19 Aug 2024 10:14:05 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sfzOk-0002Dl-K1 for kernel-team@lists.ubuntu.com; Mon, 19 Aug 2024 10:14:02 +0000 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (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-0.canonical.com (Postfix) with ESMTPS id 47F3E3FAE8 for ; Mon, 19 Aug 2024 10:14:02 +0000 (UTC) Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-42820c29a76so36503565e9.2 for ; Mon, 19 Aug 2024 03:14:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724062442; x=1724667242; 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=Qv+C4oQqb0k3ZiaaTuz6LxAJ5u5GUCIL3yO+LapQvjo=; b=AqVzA7WGUb9X51P62Y35NK0LPUF2lKzxLvL/qzTOOoiE5BjBC+Ng7V27ff5HZsA7NF Zif675DAPZR3s66UGAC3M7azA25QW+YMkxT3iQrhBEsHS+awOzrbjgy1WkZHfyYTS123 jOAZ71GJ4X/IPOTu2hAOfohKKEsDD+zyAgtXvyYCEZF0Vpy8J79BQl+RKYtSdLpTOM8S DhXzOSbj3vfT/7VbL3UlflZ2KmnfEp9K8f+VuyN6TWQWfL+2b27DvAke80Xmq/MiLaQe LvwNObVyQs9bGBcZRUtzRnWEyup0URhBwvFh4XeQc1836YMQuUMV4TdeGBFGdmSGGCB4 asUQ== X-Gm-Message-State: AOJu0YwW8p5pYRvx6wn4EcS8T/hK8cF9rLwbXeHninHNJorih3QNvopd 2jka+t0k5BHnKZO+7gDXkm+xB5eUQJdNgo1w5xFww3QX7KXRTN0Z3nDASbbkct90js1IaefIh8o DmWBvpNZEW/fLRA8rfEQoAeO2L2SH38C/Ao990MI3F1SpocSDVD/TZgttWmwUN59zVZQ3TztbCp H3OycJ8qHqdA== X-Received: by 2002:a05:600c:1ca9:b0:427:ac40:d4b1 with SMTP id 5b1f17b1804b1-429ed7cc4edmr61130565e9.27.1724062441768; Mon, 19 Aug 2024 03:14:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGW2obhNphuGvIXhsTXjCxG3DYTB9r+vA8IbNE1ZlNPvhwVbFDdhpOm7PiCakqwH+HDjYl7Zg== X-Received: by 2002:a05:600c:1ca9:b0:427:ac40:d4b1 with SMTP id 5b1f17b1804b1-429ed7cc4edmr61130325e9.27.1724062440989; Mon, 19 Aug 2024 03:14:00 -0700 (PDT) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-371898aad93sm10094626f8f.95.2024.08.19.03.14.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 03:14:00 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][N:ibm][PATCH 1/3] UBUNTU: [Packaging] ibm: Don't build linux-ibm-cloud-tools-common Date: Mon, 19 Aug 2024 12:13:55 +0200 Message-ID: <20240819101357.35376-2-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/2048183 Signed-off-by: Juerg Haefliger --- debian.ibm/control.stub.in | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/debian.ibm/control.stub.in b/debian.ibm/control.stub.in index 97089b8db89d..d04b3fd043d8 100644 --- a/debian.ibm/control.stub.in +++ b/debian.ibm/control.stub.in @@ -112,17 +112,6 @@ Description: Linux kernel version specific tools for version PKGVER-ABINUM =HUMAN=. You probably want to install linux-tools-PKGVER-ABINUM-. -Package: SRCPKGNAME-cloud-tools-common -Build-Profiles: -Architecture: all -Multi-Arch: foreign -Section: kernel -Priority: optional -Depends: ${misc:Depends} -Description: Linux kernel version specific cloud tools for version PKGVER - This package provides the architecture independent parts for kernel - version locked tools for cloud tools for version PKGVER. - Package: SRCPKGNAME-cloud-tools-PKGVER-ABINUM Build-Profiles: Architecture: amd64 From patchwork Mon Aug 19 10:13:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1973771 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 4WnT3C1x4Kz23Rl 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 1sfzOo-0002IJ-Ad; Mon, 19 Aug 2024 10:14:06 +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 1sfzOm-0002G3-8h for kernel-team@lists.ubuntu.com; Mon, 19 Aug 2024 10:14:04 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (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 891013F2EF for ; Mon, 19 Aug 2024 10:14:03 +0000 (UTC) Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4280cf2be19so34062735e9.3 for ; Mon, 19 Aug 2024 03:14:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724062443; x=1724667243; 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=VgrmDgHgpXQyGWyVKiUvMDDvy91TY2iMc9yEg+bg5hU=; b=bUgySSg5VS7p8UhKToAF9Rjzro7gC0OCPucrbF9QAKTwUgGzZz6E5C4GmxYg1Msu// k/wlvKRZYggirRbCp+jjDJEJ5yK2oXAZWSOms8NQ+WhtmTU8SwjdiDQs62GBmoU714jI FTAG5J8P2RVQeKcR3fgE4WfIgj0Uz9XvTHR1lLIeBv8P9VSkYTy9ckmeTOvKe1sSr2xD y2Oxf28Gigu/+KUnMnosGvapHGzhEzuPka5xy7+IBsSIui1TCFt4EhzWtNO4hcSwVGd+ UmnHZKxLKG5/RMhFKKKF52/3RIvql9AdET/BMP7EGGV/FJ3susnOwauzvzuquxRzkdlU NeXQ== X-Gm-Message-State: AOJu0YxbottxHvHKGkAB8Ilp6AdgnlmgMTRFYloF1hspxlh4Ar3Bb1IF Jsxr27LU4sGPEib3vUoMH9bfkBPmOw1pvA6lN4HdGm+jRzJWZhkvm3KI47FIgC8V/xBm6b09+4I wBUMIs2Quai+uluIj2SSIL7PjR0oi15eNT82by45NcgqGG9404f8SzSf4qKOTkAfaNrLHD3Cn9M vZhapHVC2n+A== X-Received: by 2002:a05:600c:3411:b0:426:6f31:5f5c with SMTP id 5b1f17b1804b1-42aae367f23mr24324215e9.17.1724062443033; Mon, 19 Aug 2024 03:14:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFl07GKepFvfOwas+BpeHKAQEcPgiCVX5dhhk16CpKuSGJmLLZ+cpwFcFYncbfDq/hXg27gTA== X-Received: by 2002:a05:600c:3411:b0:426:6f31:5f5c with SMTP id 5b1f17b1804b1-42aae367f23mr24323985e9.17.1724062442281; Mon, 19 Aug 2024 03:14:02 -0700 (PDT) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-371898aacf9sm10115042f8f.102.2024.08.19.03.14.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 03:14:01 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][N:ibm][PATCH 2/3] UBUNTU: [Packaging] ibm: Don't build linux-ibm-source- Date: Mon, 19 Aug 2024 12:13:56 +0200 Message-ID: <20240819101357.35376-3-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/2052439 Signed-off-by: Juerg Haefliger --- debian.ibm/control.stub.in | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/debian.ibm/control.stub.in b/debian.ibm/control.stub.in index d04b3fd043d8..d70987c1b10d 100644 --- a/debian.ibm/control.stub.in +++ b/debian.ibm/control.stub.in @@ -63,30 +63,6 @@ Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-ibm/+git/=S XS-Testsuite: autopkgtest #XS-Testsuite-Depends: gcc-4.7 binutils -Package: SRCPKGNAME-source-PKGVER -Build-Profiles: -Architecture: all -Section: devel -Priority: optional -Provides: SRCPKGNAME-source -Depends: ${misc:Depends}, binutils, bzip2, coreutils -Recommends: libc-dev, gcc, make -Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev -Description: Linux kernel source for version PKGVER with Ubuntu patches - This package provides the source code for the Linux kernel version - PKGVER. - . - This package is mainly meant for other packages to use, in order to build - custom flavours. - . - If you wish to use this package to create a custom Linux kernel, then it - is suggested that you investigate the package kernel-package, which has - been designed to ease the task of creating kernel image packages. - . - If you are simply trying to build third-party modules for your kernel, - you do not want this package. Install the appropriate SRCPKGNAME-headers - package instead. - Package: SRCPKGNAME-headers-PKGVER-ABINUM Build-Profiles: Architecture: all 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 -