From patchwork Thu Jun 6 14:37:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1944699 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 4Vw6Pj53D3z20Q5 for ; Fri, 7 Jun 2024 00:38:00 +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 1sFEFO-0008EB-Ic; Thu, 06 Jun 2024 14:37:46 +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 1sFEFM-0008E2-PR for kernel-team@lists.ubuntu.com; Thu, 06 Jun 2024 14:37:44 +0000 Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (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 674343F1AF for ; Thu, 6 Jun 2024 14:37:44 +0000 (UTC) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-70244a8998bso725192b3a.2 for ; Thu, 06 Jun 2024 07:37:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717684663; x=1718289463; 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=MdSO0JjMH+4d48iW1dC8gyqVfvmBxS0BGbDB93L/Ma4=; b=O+D6vSDr/2kCeX0EGdHNpyk8LL5BE3YJqoVzHJehXAk09VY7apekICtRrO0xhfp7TC r8C1HxLw7LgypwCwyxhZBzwULhArrXn+SD9gm5SuhunnBDUbnAQG1za3wIpHL/unXY90 51y1jLY5KiS+tqQBjCNLRGvAAN/kcqTPiRIr4UrvP3M2v3uMRtM07h4vjRYNKZtIhNOp akO7OLmntIsrSOvic4B0/cIHDKuz77VrJLUJyd5idw1Dl+V7s0k8jcJZvqwkMoaz+d2K tTcp1c1w7x1bFnWB+ZaqSpo1qm2WaLt4la6IBqN+3bAnoB+05mik7DN4lP1wEYwT7gHp MKdQ== X-Gm-Message-State: AOJu0YwEs9FAJFlWJY5hWl/udWS+WQjsZgTa30twkjhHq6RCDnl6QEuy 8fIPzXrV68chMbZ5uk6R7iyGURxgWPBMk3oV83j3/OuDJAdDWab/jnzWQFpHifNfeurMstn4XrV XBnxsz6R8jnHhipEg9jxftMy3XavjTd0H8fInPbES68Hli+Qdgoxf6lCY/XsO4xSGv6mKY6f6lC UZTNAjR7+IlQ== X-Received: by 2002:a05:6a00:1d92:b0:6ec:db05:36c3 with SMTP id d2e1a72fcca58-703e594b158mr5614007b3a.4.1717684662888; Thu, 06 Jun 2024 07:37:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFDHDzc9xlocGYyWA1Ny1RMbgm6O/ghLrtTmEAtbVxPoTHYPE1+06U+/kSqsWA6iEqlsbVUA== X-Received: by 2002:a05:6a00:1d92:b0:6ec:db05:36c3 with SMTP id d2e1a72fcca58-703e594b158mr5613983b3a.4.1717684662385; Thu, 06 Jun 2024 07:37:42 -0700 (PDT) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1001]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-703fd371cc7sm1198084b3a.2.2024.06.06.07.37.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 07:37:42 -0700 (PDT) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [Oracular/Unstable PATCH] UBUNTU: [packaging] remove the kernel configuration for perf Date: Thu, 6 Jun 2024 23:37:32 +0900 Message-ID: <20240606143732.999290-1-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.43.0 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" This was introduced by commit "UBUNTU: [Debian] perf -- build in the context of the full generated local headers". [1] If you intend to build perf with the latest UAPI headers, you need to run 'make headers_install'. Since tools/perf is a userspace program, the kernel configuration or 'make prepare' should not be necessary. Remove this, as it never worked as intended. [1]: https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/xenial/commit/?id=5531fa5fadf52af8cd0cfcd6ac65a2663cf3a863 Signed-off-by: Masahiro Yamada --- This was originally written during the hackathon last year, but it was not merged. Let me retry as a separate patch. debian/rules.d/2-binary-arch.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 94c9cd5c6b89..13032f221664 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -647,13 +647,6 @@ ifeq ($(do_tools_cpupower),true) CPUFREQ_BENCH=false endif ifeq ($(do_tools_perf),true) - cd $(builddirpa) && $(kmake) $(defconfig) - mv $(builddirpa)/.config $(builddirpa)/.config.old - sed -e 's/^# \(CONFIG_MODVERSIONS\) is not set$$/\1=y/' \ - -e 's/.*CONFIG_LOCALVERSION_AUTO.*/# CONFIG_LOCALVERSION_AUTO is not set/' \ - $(builddirpa)/.config.old > $(builddirpa)/.config - cd $(builddirpa) && $(kmake) syncconfig - cd $(builddirpa) && $(kmake) prepare cd $(builddirpa)/tools/perf && \ $(kmake) prefix=/usr NO_LIBTRACEEVENT=1 HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 WERROR=0 endif