From patchwork Thu Jun 29 12:05:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1801471 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=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=RrbfKQr5; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (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 4QsHG60YbJz20ZC for ; Thu, 29 Jun 2023 22:05:34 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qEqOu-0003mF-Rk; Thu, 29 Jun 2023 12:05:28 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qEqOt-0003lZ-LC for kernel-team@lists.ubuntu.com; Thu, 29 Jun 2023 12:05:27 +0000 Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.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-0.canonical.com (Postfix) with ESMTPS id 6057D3F10B for ; Thu, 29 Jun 2023 12:05:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1688040327; bh=8bjO40tQ3pjyrf4U7wXGefxo3lQ65kgp8N5pIWR09hg=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=RrbfKQr5ZNsQ+v38fO8TXiwVnBbpnf8yFp1q9bdnufMF3gDLpboK7VOnSdZYrEjeK wG12//Jm5cf0k30mMeB69ZFcclkk3w7U8aH9+c4hzQBaIAf5mVq5O/SY9bLzdlCUri H/cekSYjpygFXZkBPjHTiwvq6wdNyblnZcgXTS5MDrqI6MdYqIkW3yNm7FDmlt5ipj niloyFZYsHVn1aZiwp9Xca1pSEflF81nFSMI91YrVsLB3jdQqapvCWp5Zk+1jS9ucX BoMNi8CkrTaiXse2dwq/4bC9E1jsHNxn4X21U51h6PvXQvD08b5r082nLeFq8w/TzP KAwrn7dfb3eGw== Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-4fb9c4b7020so479118e87.0 for ; Thu, 29 Jun 2023 05:05:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688040327; x=1690632327; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8bjO40tQ3pjyrf4U7wXGefxo3lQ65kgp8N5pIWR09hg=; b=fNMSa7VkTuyIKXmUdKyQUTGaifZTbNy7FljXS9HYEtyTqKAVy9PVMJgFMwmuvw34eD LDqhBCSXXsdT4Po7vStlid98QzWVMhTo2Doq0w4mrTHqkncWmAfgQvKSIUvHo9Pn/iH1 L1QTderCIoeH880YfLTEK2kqRFZ/gUdIk+6uoBxfdytGjnt6FHLYvOIIyPhzuyKaG0ZZ kvm+38PcJsbDvnXmJ0v/l7M6skMSgVm1GKkL1L+wJt2e6ESY/0P+cKUayO7mQpP/6drI EmyoG2upfk8pobDeqjKP1bhZSugL5s2dDWICLDrCKXFeRvz16s3bB8J8M3giOW8uB4Si Btlw== X-Gm-Message-State: AC+VfDxb7VROATth3FWPDM3QB9NVTrrFa5SO7E1flkXgvLL9EzTezHId EuudcvOmltj7gpuOJ2atUrBh5OFJiJu6ui+U3FVejFXuqtKYQXF32iEIjEY/koU+X+FkS/zrLk3 efachSaJc4Nc3wrtTE6hs0UNZ6pP7DncX1K/akzoKZONdgTp6IA== X-Received: by 2002:a05:6512:3d21:b0:4fb:4368:14a1 with SMTP id d33-20020a0565123d2100b004fb436814a1mr12224043lfv.18.1688040326769; Thu, 29 Jun 2023 05:05:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ77hG10umr9TSKLDSfqy8A633XFH3hBhQm0vxtJcBB5gLbXVt7lEKKSEENIBPHSfOmyi+D1gw== X-Received: by 2002:a05:6512:3d21:b0:4fb:4368:14a1 with SMTP id d33-20020a0565123d2100b004fb436814a1mr12224026lfv.18.1688040326414; Thu, 29 Jun 2023 05:05:26 -0700 (PDT) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id z20-20020a7bc7d4000000b003f90067880esm19166716wmk.47.2023.06.29.05.05.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jun 2023 05:05:25 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable:meta][PATCH v2] UBUNTU: [Packaging] Transition armhf generic-lpae to generic Date: Thu, 29 Jun 2023 14:05:24 +0200 Message-Id: <20230629120524.44012-1-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.39.2 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/2025265 The armhf generic flavor is now LPAE-enabled and the only armhf flavor, so transition generic-lpae to generic. Signed-off-by: Juerg Haefliger Acked-by: Tim Gardner --- v2: - Add missing BugLink. --- debian/control.d/generic-lpae | 36 --------------------- debian/control.d/transitionals-generic-lpae | 32 ++++++++++++++++++ debian/control.d/virtual | 6 ++-- 3 files changed, 35 insertions(+), 39 deletions(-) delete mode 100644 debian/control.d/generic-lpae create mode 100644 debian/control.d/transitionals-generic-lpae diff --git a/debian/control.d/generic-lpae b/debian/control.d/generic-lpae deleted file mode 100644 index 09ed0440704b..000000000000 --- a/debian/control.d/generic-lpae +++ /dev/null @@ -1,36 +0,0 @@ -Package: linux-headers-generic-lpae${variant:suffix} -Architecture: armhf -Section: kernel -Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic-lpae -Description: Generic LPAE Linux kernel headers - This package will always depend on the latest generic-lpae kernel headers - available. - -Package: linux-image-generic-lpae${variant:suffix} -Architecture: armhf -Section: kernel -Provides: ${dkms:wireguard-linux-compat-modules} -Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic-lpae, linux-firmware -Recommends: thermald [amd64] -Description: Generic LPAE Linux kernel image - This package will always depend on the latest generic-lpae kernel image - available. - -Package: linux-tools-generic-lpae${variant:suffix} -Architecture: armhf -Section: kernel -Provides: linux-tools -Depends: ${misc:Depends}, linux-tools-${kernel-abi-version}-generic-lpae -Description: Generic LPAE Linux kernel tools - This package will always depend on the latest generic-lpae kernel tools - available. - -Package: linux-generic-lpae${variant:suffix} -Architecture: armhf -Section: kernel -Provides: ${test:provides-full-generic-lpae} -Depends: ${misc:Depends}, linux-image-generic-lpae${variant:suffix} (= ${binary:Version}), linux-headers-generic-lpae${variant:suffix} (= ${binary:Version}) -Description: Complete Generic LPAE Linux kernel and headers - This package will always depend on the latest complete generic-lpae Linux kernel - and headers. - diff --git a/debian/control.d/transitionals-generic-lpae b/debian/control.d/transitionals-generic-lpae new file mode 100644 index 000000000000..883dc603ed9e --- /dev/null +++ b/debian/control.d/transitionals-generic-lpae @@ -0,0 +1,32 @@ +# +# Generated using kteam-tools script: +# generate-transitions --input debian/control --output debian/control.d/transitionals-generic-lpae generic-lpae generic +# +Package: linux-headers-generic-lpae +Architecture: armhf +Section: oldlibs +Depends: linux-headers-generic +Description: Generic LPAE Linux kernel headers (dummy transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-image-generic-lpae +Architecture: armhf +Section: oldlibs +Depends: linux-image-generic +Description: Generic LPAE Linux kernel image (dummy transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-tools-generic-lpae +Architecture: armhf +Section: oldlibs +Depends: linux-tools-generic +Description: Generic LPAE Linux kernel tools (dummy transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-generic-lpae +Architecture: armhf +Section: oldlibs +Depends: linux-generic-wip +Description: Complete Generic LPAE Linux kernel and headers (dummy transitional package) + Transitional package for upgrades. This package can be safely removed. + diff --git a/debian/control.d/virtual b/debian/control.d/virtual index ccfdb91d415f..fdfc8e63bd2b 100644 --- a/debian/control.d/virtual +++ b/debian/control.d/virtual @@ -1,14 +1,14 @@ Package: linux-headers-virtual${variant:suffix} Architecture: amd64 arm64 armhf ppc64el s390x Section: kernel -Depends: ${misc:Depends}, linux-headers-generic${variant:suffix} (= ${binary:Version}) [amd64 arm64 ppc64el s390x], linux-headers-generic-lpae${variant:suffix} (= ${binary:Version}) [armhf] +Depends: ${misc:Depends}, linux-headers-generic${variant:suffix} (= ${binary:Version}) Description: Virtual Linux kernel headers This package will always depend on linux-headers-generic. Package: linux-image-virtual${variant:suffix} Architecture: amd64 arm64 armhf ppc64el s390x Section: kernel -Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic [amd64 arm64 ppc64el s390x], linux-image-${kernel-abi-version}-generic-lpae [armhf] +Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic Provides: ${dkms:zfs-modules} ${dkms:virtualbox-guest-modules} ${dkms:wireguard-linux-compat-modules} Description: Virtual Linux kernel image This package will always depend on the latest minimal generic kernel image @@ -18,7 +18,7 @@ Package: linux-tools-virtual${variant:suffix} Architecture: amd64 arm64 armhf ppc64el s390x Section: kernel Provides: linux-tools -Depends: ${misc:Depends}, linux-tools-${kernel-abi-version}-generic [amd64 arm64 ppc64el s390x], linux-tools-${kernel-abi-version}-generic-lpae [armhf] +Depends: ${misc:Depends}, linux-tools-${kernel-abi-version}-generic Description: Virtual Linux kernel tools This package will always depend on the latest minimal generic kernel tools used for virtual instances.