From patchwork Fri Jul 16 10:44:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 1506132 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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: 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=R6PdXugZ; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GR7DR63LLz9sj1; Fri, 16 Jul 2021 20:45:11 +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 1m4LLA-0004l3-MB; Fri, 16 Jul 2021 10:45:08 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1m4LL7-0004kX-4f for kernel-team@lists.ubuntu.com; Fri, 16 Jul 2021 10:45:05 +0000 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.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-canonical-1.canonical.com (Postfix) with ESMTPS id 0476A4060A for ; Fri, 16 Jul 2021 10:45:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626432305; bh=572FMKvpguxAu5anHnWDXiui+kl6Sr9FV5hICGSDKI4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=R6PdXugZZFpp+8b5aAbUETWfwWviHyIzqm6nzncbmes2z5fdyoN3cP0ANKOva3Cic gNcXfnWoqLYbyZXSXTRJWjWmLLdkgzoZr5ZrByl+Ib6fLtBhjVznu45lexLegTPORm 4Ly+jkIzKTNDQN4nLRAVqinHOtamTa1zj0bRUUO4e+mSTlj6qQYY4W7cHKeiK2JeG6 OWBJvuhfNn3mv/2BtmKmklEoUUpkG0eOokKIrPrZTkrx07qDfJJO+mzmX1kpoYlUpY OvLxvEJ+svsOeYoZ7l9heOxBz+vK11op4CSZAEcw0H6MA5uy7XR7Px7UJD6wmGcHac +ovFL7rpGnnjw== Received: by mail-ed1-f71.google.com with SMTP id v2-20020a50c4020000b02903a6620f87feso4645310edf.18 for ; Fri, 16 Jul 2021 03:45:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=572FMKvpguxAu5anHnWDXiui+kl6Sr9FV5hICGSDKI4=; b=m2SRM42NW8SfPtg6zSYmaxkXaD5R7x6moYqnhgxV+XdCriiGUxtiYpCjR74CxEDv9x g9PxKb+2HKqfVy4X3fIboeuMGTYB/P++geenbxwZ4nVRe7Sn1Hkkg8tDM8U0v0Q71C5E WoGJpUYWUoYICMQx2THxXDxkKo0dAD2fsA8K1iQ2YpMHw6edMYuWP1lCsIqL1WmNu/lp Mh0nJvzDrEaaC2EsTvbu7+RRmO59mdlFRkASr2Mnzc/oLuSao1reLSwRYDOsMGmUYqj1 ALsD8fy8rpW1r/jTkGIVk4PwWPnj7JZyW79ghdWcaiz4d8VDKUARy3ESarwH5lGUYucS NsUQ== X-Gm-Message-State: AOAM532f1Sx2SThjTLCSKkLRE2j7iNNUlaCGFd+uSkIb+6K3DxW468Ci 52z/snmhPcu2jFtUIs5WqDsrj8g4GyJn9i7JsNmMIjna0//+paiqNVLaYS5d0K1m+Y4ieVyObzq 2OJO86TkFRUbPWPTglLgv467rPdTiTnnc2/w449qc8Q== X-Received: by 2002:a17:907:9604:: with SMTP id gb4mr10918888ejc.142.1626432304503; Fri, 16 Jul 2021 03:45:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrahFcHXJRrcqZOLW/JJj7hSTEALfrfVR4at+R44GbIZ4AcCQRJr2xL7RGUhSGyu7eN52BhA== X-Received: by 2002:a17:907:9604:: with SMTP id gb4mr10918872ejc.142.1626432304260; Fri, 16 Jul 2021 03:45:04 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-177-222.adslplus.ch. [188.155.177.222]) by smtp.gmail.com with ESMTPSA id nc29sm2722473ejc.10.2021.07.16.03.45.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jul 2021 03:45:03 -0700 (PDT) From: Krzysztof Kozlowski To: kernel-team@lists.ubuntu.com Subject: [SRU][F oracle-5.11][PATCH 1/1] UBUNTU: [Config]: Revert "UBUNTU: [Config] disable AUFS (second time)" Date: Fri, 16 Jul 2021 12:44:23 +0200 Message-Id: <20210716104423.54149-2-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210716104423.54149-1-krzysztof.kozlowski@canonical.com> References: <20210716104423.54149-1-krzysztof.kozlowski@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/1936478 This reverts commit e0a18a43d480ce1f99a85ff636625f95a979d5b8. In initial oracle-5.11 edge backport, the local-mangle was copied from Focal/hwe-5.11 which contains Focal specific settings, like enabling AUFS. Later this was removed in commit e0a18a43d480 ("UBUNTU: [Config] disable AUFS (second time)") which was wrong - Focal is still supporting AUFS in all its kernels. Bring back AUFS. Signed-off-by: Krzysztof Kozlowski Acked-by: Kleber Sacilotto de Souza --- .../scripts/helpers/local-mangle | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/debian.oracle-5.11/scripts/helpers/local-mangle b/debian.oracle-5.11/scripts/helpers/local-mangle index 894f6aa2ca5b..edacc036e614 100755 --- a/debian.oracle-5.11/scripts/helpers/local-mangle +++ b/debian.oracle-5.11/scripts/helpers/local-mangle @@ -50,6 +50,51 @@ sed -i "s/CONFIG_INTEL_IOMMU_SVM policy<{'amd64': 'y', # 'ARM64_BTI_KERNEL'. sed -i "/CONFIG_ARM64_BTI_KERNEL policy<{'arm64': 'y'}>/d" ${DEBIAN}/config/annotations +# Re-enable AUFS +# +# We are still supporting AUFS in focal, so make sure to re-enable it. +cat << EOF >> ${DEBIAN}/config/config.common.ubuntu +CONFIG_AUFS_BDEV_LOOP=y +# CONFIG_AUFS_BRANCH_MAX_1023 is not set +CONFIG_AUFS_BRANCH_MAX_127=y +# CONFIG_AUFS_BRANCH_MAX_32767 is not set +# CONFIG_AUFS_BRANCH_MAX_511 is not set +# CONFIG_AUFS_BR_FUSE is not set +CONFIG_AUFS_BR_HFSPLUS=y +# CONFIG_AUFS_BR_RAMFS is not set +# CONFIG_AUFS_DEBUG is not set +CONFIG_AUFS_DIRREN=y +CONFIG_AUFS_EXPORT=y +# CONFIG_AUFS_FHSM is not set +CONFIG_AUFS_FS=m +# CONFIG_AUFS_HNOTIFY is not set +CONFIG_AUFS_INO_T_64=y +# CONFIG_AUFS_RDU is not set +CONFIG_AUFS_SBILIST=y +# CONFIG_AUFS_SHWH is not set +CONFIG_AUFS_XATTR=y +EOF + +TMPFILE=$(mktemp) +cat <${TMPFILE} || true +CONFIG_AUFS_FS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> +CONFIG_AUFS_HNOTIFY policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_AUFS_EXPORT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_AUFS_XATTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_AUFS_FHSM policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_AUFS_RDU policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_AUFS_DIRREN policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_AUFS_SHWH policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_AUFS_BR_RAMFS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_AUFS_BR_FUSE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_AUFS_BR_HFSPLUS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', }> +CONFIG_AUFS_DEBUG policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> +# +CONFIG_AUFS_EXPORT note +EOF +gawk -i inplace "/CONFIG_AUFS_FS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>/{system(\"cat ${TMPFILE}\");next}1" ${DEBIAN}/config/annotations +rm -f ${TMPFILE} + # 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