From patchwork Fri Jan 13 09:45:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1725843 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=acmEW5iw; 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 4Ntc49240Fz23g9 for ; Fri, 13 Jan 2023 20:45:59 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pGGdA-0006st-Mv; Fri, 13 Jan 2023 09:45:48 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-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 1pGGd4-0006qp-5h for kernel-team@lists.ubuntu.com; Fri, 13 Jan 2023 09:45:42 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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 F09363F764 for ; Fri, 13 Jan 2023 09:45:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1673603141; bh=Q0OfyYwQNUp0p3PgXzJKozkIrzOoWlAYXynFVrgXhVs=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=acmEW5iwescAVeBLsvsV8bNNIxspi15ClCDZkIe/kOhGOUMq4ozLC0zdI6Dbb/XP3 hFNHfLpxHCxX1sC8B4lZEICI787JCnak9C74LYX0HpKJaHCUTFw0a0/9SH91xqKGeh 3R2BX7YVNEh/qfoYXf7QdPkqmdD8fTTfp0CZ+ZCBGZdTx/ihZ09/rRzxzEqSMFe7CW i7yOm2I6eerKsse6AO2EkYnz4rDHp3bLOraYf5TFMMz1nvPnN0pT0OZTcY8D6A9G9m igFVZCpw3+Dh1hNV0WFUdn+LvFLkotZ2g1xlyDiYzkEJcrsL4fFwrwF8tUAhGvO25P Hbf/WiKCCO+zA== Received: by mail-ed1-f69.google.com with SMTP id y21-20020a056402359500b0048123f0f8deso14341744edc.23 for ; Fri, 13 Jan 2023 01:45:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Q0OfyYwQNUp0p3PgXzJKozkIrzOoWlAYXynFVrgXhVs=; b=vtY5P7b0HOEDNuQigZmOudMYrCaSsN4qu9MjhYqqhYtrdL6/NH5+64RfCALtlXK1HE GeTF+Fgsryrg7wI0K6dkVrLVyd8goTEENGld1ojicn9o3taWC2MXt3U6A+mR56y40HJd 2lZMBOynCfKQIpgOo2HKUa0tksgwuUBBHC/Jc4vpjcY+H8802zLxQieYVgy/ZjyibF1z qG/IqlzHYwQYijZrwfU6VW2b8WOHIe6dx5pSLDsfdLV8LlNGQDcKaPxuo//RzscTjILD QiPRt6hbjB1PRtOV2FiFewzHZb83ZxPwXIha9Hlaz2XcCWZOY5QJYGMXJLOze+kxt0Vw d4Og== X-Gm-Message-State: AFqh2krvBVoXAWc04GO6BY+Sz2rpzB7h+Pt/UrVnUwfJDrg7JncG4hXm J7d351cbDjM6Zgt2Twmt6IK79WgR4TcW+G2v/WTELoNFu+Z2UhxAmYdZ3vOw2P81q6zhwI+1prr XYVibZ0xmcmU9TayciH9LbU5fa8SNZ84r3JzAfqoxEA== X-Received: by 2002:a17:907:8c8e:b0:7c0:f2c5:ac3d with SMTP id td14-20020a1709078c8e00b007c0f2c5ac3dmr75589034ejc.15.1673603141687; Fri, 13 Jan 2023 01:45:41 -0800 (PST) X-Google-Smtp-Source: AMrXdXuzc5gHfGHkLRR9H8x5atDoiiiOm+S6b4TMxXf2Unpi9b/ACmy+WwdX0iX8HInWx0/u8gp4kA== X-Received: by 2002:a17:907:8c8e:b0:7c0:f2c5:ac3d with SMTP id td14-20020a1709078c8e00b007c0f2c5ac3dmr75589022ejc.15.1673603141524; Fri, 13 Jan 2023 01:45:41 -0800 (PST) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id b4-20020a1709065e4400b00865ef3a3109sm1691681eju.66.2023.01.13.01.45.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 01:45:41 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Lunar][PATCH 1/5] UBUNTU: [Packaging] debian/rules: Remove unused target 'diffupstream' Date: Fri, 13 Jan 2023 10:45:33 +0100 Message-Id: <20230113094537.265143-2-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230113094537.265143-1-juerg.haefliger@canonical.com> References: <20230113094537.265143-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" The maintainer make target 'diffupstream' is old/obsolete/unused, so remove it. Signed-off-by: Juerg Haefliger --- debian/rules.d/1-maintainer.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index e32ea9c78eab..8373b81ed2cb 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -1,7 +1,7 @@ # The following targets are for the maintainer only! do not run if you don't # know what they do. -.PHONY: printenv updateconfigs defaultconfigs genconfigs migrateconfigs printchanges insertchanges startnewrelease diffupstream help autoreconstruct finalchecks +.PHONY: printenv updateconfigs defaultconfigs genconfigs migrateconfigs printchanges insertchanges startnewrelease help autoreconstruct finalchecks help: @echo "These are the targets in addition to the normal $(DEBIAN) ones:" @@ -22,8 +22,6 @@ help: @echo @echo " startnewrelease : Start a new changelog set" @echo - @echo " diffupstream : Diff stock kernel code against upstream (git)" - @echo @echo " compileselftests : Only compile the selftests listed on ubuntu_selftests variable" @echo @echo " runselftests : Run the selftests listed on ubuntu_selftests variable" @@ -148,9 +146,6 @@ ifeq ($(do_fips_checks),true) endif $(DROOT)/scripts/misc/final-checks "$(DEBIAN)" "$(prev_fullver)" -diffupstream: - @git diff-tree -p refs/remotes/linux-2.6/master..HEAD $(shell ls | grep -vE '^(ubuntu|$(DEBIAN)|\.git.*)') - startnewrelease: dh_testdir @[ -f "$(DEBIAN)/etc/update.conf" ] && . "$(DEBIAN)/etc/update.conf"; \ From patchwork Fri Jan 13 09:45:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1725841 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=wLZUz019; 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 4Ntc492BQ7z23gQ for ; Fri, 13 Jan 2023 20:45:59 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pGGd7-0006rU-BD; Fri, 13 Jan 2023 09:45:45 +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 1pGGd5-0006qx-4A for kernel-team@lists.ubuntu.com; Fri, 13 Jan 2023 09:45:43 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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 DB3843F117 for ; Fri, 13 Jan 2023 09:45:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1673603142; bh=tFGpv/sZN6Qiuq/bm83zEqMvfsKjMbyJecm7Ft07Y/w=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=wLZUz0190n9Nsl5R5yxbX38ZktkbO+b4egOADxH9ZCQrUIWqxejtoQS1isHfqUpyr 0xGZw2T8Ov5YSnfSbZUDxZ8mAFZuh6CZCjlnfhasIHe3jQ2BzDw/zAlaOIUfkvr6kp LpHCyl8Lhz99pgQE3cL1+qntLXD3G3szqWrh/a3Zd114OqtXLE5l1OzagxEmpurGtM AGCzw2bPSmD8JHJ26uxUVED3yFUGtvpgHvTU+MQAbLx0nszTIiw1EEALW/4CuBJf1T JsrNOB6SfV50ZMNZH5RVyViAUp6A+lL06DpZDODhqnin4ME3yi89XN7syjhp92prll D68Ys9d+/whiA== Received: by mail-ed1-f69.google.com with SMTP id l17-20020a056402255100b00472d2ff0e59so14202069edb.19 for ; Fri, 13 Jan 2023 01:45:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=tFGpv/sZN6Qiuq/bm83zEqMvfsKjMbyJecm7Ft07Y/w=; b=jvd3fzwvtN4VfTLIoXrEkJt3ysJQwYkcsW6V9waCvuIX3qlCU/oRSzYg2SBEVvtGHb //NCzKmmsPerNJrmy1e/bYsh0tOgwA3jy5UWuUTJlYGFrJL9bpcHdF2DuI+AHBUq2zPO AEbkQJAE06F18TyZ27iTggNzJfFJTpHpLvDS7KZFc11Mij5REknkC/tLiy3bw5gv0T/u nqBHMUfY+kEH1SUcHTDITUomiEuecFGUO94iZiMo2Fq1l0bNzUpBzPVqF3tzUIg7VNoN NVNzSd2OWl2HvmcfNgPu328zUVE0CWdiky8RSnklxrjeIFmzU5RUl16eUvwkwuCD4qvT jlkw== X-Gm-Message-State: AFqh2kp1922OM8j8re/6USLgTsrYPnTvzHpkfgvU5OCp5DVG69XvAaGZ ar+E1LGRFXxt/RIYSvWnyhpTab/lEvfeBymAXHRyjVVUynMHWKcHeDsJ4qoqaOFpfaZE8QixBoA LKDeg2h12+xQc8WwVo7VgqdHkQJm3x0pi0GgCAaI7iw== X-Received: by 2002:a17:906:8c3:b0:84d:2078:1fd6 with SMTP id o3-20020a17090608c300b0084d20781fd6mr2511759eje.34.1673603142573; Fri, 13 Jan 2023 01:45:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXvt53ygqgdD0MWUngwbolZc6F0yeNJkuEo+9j5U/etWZ30A+Bm25gTByP/VkUKJhJmI6NeVbg== X-Received: by 2002:a17:906:8c3:b0:84d:2078:1fd6 with SMTP id o3-20020a17090608c300b0084d20781fd6mr2511753eje.34.1673603142377; Fri, 13 Jan 2023 01:45:42 -0800 (PST) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id b4-20020a1709065e4400b00865ef3a3109sm1691681eju.66.2023.01.13.01.45.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 01:45:41 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Lunar][PATCH 2/5] UBUNTU: [Packaging] debian/rules: Mark PHONY targets individually Date: Fri, 13 Jan 2023 10:45:34 +0100 Message-Id: <20230113094537.265143-3-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230113094537.265143-1-juerg.haefliger@canonical.com> References: <20230113094537.265143-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" Mark all PHONY targets individually in rules.d/1-maintainer.mk rather than listing them on a single line. This makes it easier to spot missing PHONY markers and also matches the other rules files. Signed-off-by: Juerg Haefliger --- debian/rules.d/1-maintainer.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 8373b81ed2cb..712c152376f6 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -1,8 +1,7 @@ # The following targets are for the maintainer only! do not run if you don't # know what they do. -.PHONY: printenv updateconfigs defaultconfigs genconfigs migrateconfigs printchanges insertchanges startnewrelease help autoreconstruct finalchecks - +.PHONY: help help: @echo "These are the targets in addition to the normal $(DEBIAN) ones:" @echo @@ -38,6 +37,7 @@ help: printdebian: @echo "$(DEBIAN)" +.PHONY: migrateconfigs migrateconfigs: dh_testdir; if [ -e "$(DEBIAN)/config/config.common.ubuntu" ]; then \ @@ -65,6 +65,7 @@ $(configs-targets): fi; rm -rf build +.PHONY: printenv printenv: dh_testdir @echo "src package name = $(src_pkg_name)" @@ -117,6 +118,7 @@ printenv: @echo "arch = $(arch)" @echo "kmake = $(kmake)" +.PHONY: printchanges printchanges: @baseCommit=$$(git log --pretty=format:'%H %s' | \ gawk '/UBUNTU: '".*Ubuntu-.*`echo $(prev_fullver) | sed 's/+/\\\\+/'`"'(~.*)?$$/ { print $$1; exit }'); \ @@ -128,9 +130,11 @@ printchanges: git log "$$baseCommit"..HEAD | \ $(DROOT)/scripts/misc/git-ubuntu-log +.PHONY: insertchanges insertchanges: autoreconstruct finalchecks $(DROOT)/scripts/misc/insert-changes $(DROOT) $(DEBIAN) +.PHONY: autoreconstruct autoreconstruct: # No need for reconstruct for -rc kernels since we don't upload an # orig tarball, so just remove it. @@ -140,12 +144,14 @@ autoreconstruct: $(DROOT)/scripts/misc/gen-auto-reconstruct $(upstream_tag) $(DEBIAN)/reconstruct $(DROOT)/source/options; \ fi +.PHONY: finalchecks finalchecks: debian/control ifeq ($(do_fips_checks),true) $(DROOT)/scripts/misc/fips-checks endif $(DROOT)/scripts/misc/final-checks "$(DEBIAN)" "$(prev_fullver)" +.PHONY: startnewrelease startnewrelease: dh_testdir @[ -f "$(DEBIAN)/etc/update.conf" ] && . "$(DEBIAN)/etc/update.conf"; \ From patchwork Fri Jan 13 09:45:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1725840 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=vVobOCww; 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 4Ntc491xstz23fp for ; Fri, 13 Jan 2023 20:45:59 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pGGd7-0006rm-HB; Fri, 13 Jan 2023 09:45:45 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-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 1pGGd6-0006r5-58 for kernel-team@lists.ubuntu.com; Fri, 13 Jan 2023 09:45:44 +0000 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.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 9207F3F764 for ; Fri, 13 Jan 2023 09:45:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1673603143; bh=wDrtGajv/iRUJG1ogjcx5FXW/GnvKK74qWmPPUJw4Sk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vVobOCwwCLgIYo8e4VabLJxhE5Pk52mAU7h9Bef36WKOQoZOjcBv4qYDg6aUIAE3f gGiQEGTEkZOYZ52eN0QzeiPK8ctq/QfFU3NTyQl8p3+GdsGOW+UC3+Pm1RNT/RYNLu 0uNgy6hqwB6+Qxfu+knB+BRy8lZSY4ky2rWVMfUrwoq/ljBv+4+kKh2A6+owOmSbcW QzQkUd97ACZUS2+/0vW2+U9tKpKZTsuPC2Xg14DDM5Io1Mo8JqIsiQ42KmeNWD8k2F FiH2WWj/kvA2rxTgnhoe4nqK38+iySGax7WHJsUOhvQMHB0QO/zbUSlkkujirOtoeZ Pc4+ASvtd5fhw== Received: by mail-ej1-f72.google.com with SMTP id dr5-20020a170907720500b00808d17c4f27so14547374ejc.6 for ; Fri, 13 Jan 2023 01:45:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=wDrtGajv/iRUJG1ogjcx5FXW/GnvKK74qWmPPUJw4Sk=; b=KHRJLS3D/PfKMyLI8AhjUkWPJR4fSHMDXAl8X+dCPgK3k72RKN3zzsPEN/KzaFHu6I HWD7Io39/hPps7u5lV6L29oqItFuxVDf4sfik5gCkm7C01l/MTZ+HC9k8GYLfWNAwnYn za66eefq8RIfPqi62RJ6XJH7D8sAAg+2OryYRsylKCSsoMZc5JAoowDZQhjLWTBxfRLW C/QLGEo4uXfJ6ZcpabY4mtigv70HvuucGG8jDWPgjSopEFrZDtwvx1pzzVuk1UQrTIcn tiFV/RycF8k/LXe6UpCED+3ignvaE3ow50smTa7Ge1Nv3X8Ekjn+LPJyU1kxyqemhsl+ /mqg== X-Gm-Message-State: AFqh2kqUbHe8C1Y1sLlrFAo3yRwVYrvwrNJfi1qRFTB+wJAuptZQJDAx kl2wtDx0T3dNpjGY52mjj7H47oLjlJFjma5PkXd3+HJx9a5UyuYWR+/fcZQqn7gONipfWYbpdIb qMOOcgCCiwOZCsE11OOeXz1kzqxmRIdcdk5ZZP/S6UA== X-Received: by 2002:a17:906:dff5:b0:7ef:b60e:cb02 with SMTP id lc21-20020a170906dff500b007efb60ecb02mr68779875ejc.48.1673603143285; Fri, 13 Jan 2023 01:45:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXsJYxDSew77TCyww7wyTYO9nDnezDbxWkLWYns/IODAHDZ2N85C0Uh6RWK1gEErL2wEZumJoA== X-Received: by 2002:a17:906:dff5:b0:7ef:b60e:cb02 with SMTP id lc21-20020a170906dff500b007efb60ecb02mr68779868ejc.48.1673603143120; Fri, 13 Jan 2023 01:45:43 -0800 (PST) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id b4-20020a1709065e4400b00865ef3a3109sm1691681eju.66.2023.01.13.01.45.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 01:45:42 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Lunar][PATCH 3/5] UBUNTU: [Packaging] debian/rules: Clean up 'help' target output Date: Fri, 13 Jan 2023 10:45:35 +0100 Message-Id: <20230113094537.265143-4-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230113094537.265143-1-juerg.haefliger@canonical.com> References: <20230113094537.265143-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" The output of the 'help' target is misaligned and - in my opinion - too sparse. Fix that. Signed-off-by: Juerg Haefliger --- debian/rules.d/1-maintainer.mk | 35 +++++++++++----------------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 712c152376f6..611587c1fdc7 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -5,33 +5,20 @@ help: @echo "These are the targets in addition to the normal $(DEBIAN) ones:" @echo - @echo " printenv : Print some variables used in the build" - @echo - @echo " updateconfigs : Update core arch configs" - @echo - @echo " defaultconfigs : Update core arch configs using defaults" - @echo - @echo " genconfigs : Generate core arch configs in CONFIGS/*" - @echo - @echo " migrateconfigs : Automatically import old configs into annotations" - @echo - @echo " printchanges : Print the current changelog entries (from git)" - @echo - @echo " insertchanges : Insert current changelog entries (from git)" - @echo - @echo " startnewrelease : Start a new changelog set" - @echo - @echo " compileselftests : Only compile the selftests listed on ubuntu_selftests variable" - @echo - @echo " runselftests : Run the selftests listed on ubuntu_selftests variable" - @echo - @echo " help : If you are kernel hacking, you need the professional" - @echo " version of this" + @echo " printenv : Print some variables used in the build" + @echo " updateconfigs : Update core arch configs" + @echo " defaultconfigs : Update core arch configs using defaults" + @echo " genconfigs : Generate core arch configs in CONFIGS/*" + @echo " migrateconfigs : Automatically import old configs into annotations" + @echo " printchanges : Print the current changelog entries (from git)" + @echo " insertchanges : Insert current changelog entries (from git)" + @echo " startnewrelease : Start a new changelog set" + @echo " compileselftests : Only compile the selftests listed on ubuntu_selftests variable" + @echo " runselftests : Run the selftests listed on ubuntu_selftests variable" @echo @echo "Environment variables:" @echo - @echo " CONCURRENCY_LEVEL=X" - @echo " : Use -jX for kernel compile" + @echo " CONCURRENCY_LEVEL=X : Use -jX for kernel compile" .PHONY: printdebian printdebian: From patchwork Fri Jan 13 09:45:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1725839 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=ScDjbwnA; 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 4Ntc492vvWz23gV for ; Fri, 13 Jan 2023 20:45:59 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pGGdA-0006tC-Ta; Fri, 13 Jan 2023 09:45:48 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-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 1pGGd7-0006rM-0j for kernel-team@lists.ubuntu.com; Fri, 13 Jan 2023 09:45:45 +0000 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.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-1.canonical.com (Postfix) with ESMTPS id 6368A3F764 for ; Fri, 13 Jan 2023 09:45:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1673603144; bh=fM979IRe4/numjrolppczfEqTeMm7+IArCQgUBFFiVU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ScDjbwnAksGBq1A0LbtG2p36lF2IVSJajw6uPJU1tYivCW/zTkgUJ/YCyK0g3NSDe 6j5L3Igovt4TiwGizbPj0mROZbHVvL15mduOnZVSvekgjzUMsJKzBtOZDM39bvA0gB 3yVreNYBBTTJ9oCqHuh66y79w2fwH0dh4/HrmCn9P1Qwir8Ao2pkKVAWqGVp3u4Rp+ lrNGxoUtHOu2Nme0Ma2DGKWQPTBewR8mOLquGxW+3OFVsYww5yBJnLi607FQQiivyG QhJj8Hm6pUeFQ6Ilbx5dBSvzbJTeDx/y/ipJjOeVUZH04nNvgToF6aCkzO2CnhxlMp j+ekPYvt+5S/A== Received: by mail-ed1-f70.google.com with SMTP id w3-20020a056402268300b00487e0d9b53fso14259202edd.10 for ; Fri, 13 Jan 2023 01:45:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=fM979IRe4/numjrolppczfEqTeMm7+IArCQgUBFFiVU=; b=7M6/NVZoiWk1nyVUEHahwkBvQGmLoQK/8CFHxVkqiSeu2Lx+bDV5DLiwYGgpIt/XEw QuK7JGVxzK4pvHgk5NKu5ntIDTHlWKiULclrAlLOhhQBFn3s+wQq4Hs5oIxnYO1qvPFx N7e60kawiNuG1AeIl9JF5gB+RhytRaYidbYWkjwSH+QK6svIlBxGOGFoF4qzRvypzkrA NJj7R+VOFzuZhQ645joWCmagYN8kb8qKBUE1RfrF9fBCbehxIGOCJs55mpqBf9z2KCOp MZoDXiDD5OzkNGZeqiIOTZGdEeah486f2Y4R0u44zCF9FmL8vJWbYwAQIzqYFAQMUCGc IpHg== X-Gm-Message-State: AFqh2krfVw0gggL2qcr+fwJM5li81tZ48QNdC/hxmkxF5epmzcCWfc5U YXlYPHrKwytVs42of+ONtrniQWS0DnFrtElU/eRAGAU/QRFLfNW3OgE8cJkJ4SnlhgFC/f6Ssst k4q56+MIB15RVp7p8DUgJjWhjDpOc4PzoHBZS3ppYBg== X-Received: by 2002:a05:6402:249a:b0:499:cc32:6a52 with SMTP id q26-20020a056402249a00b00499cc326a52mr12698698eda.16.1673603144095; Fri, 13 Jan 2023 01:45:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXudjYVMnNWh7J3S2TaCry4CwRqBHlL9/imJ/pl+DdfNYiAa4v72HVchT3ir2Vmk/t1xZJvudw== X-Received: by 2002:a05:6402:249a:b0:499:cc32:6a52 with SMTP id q26-20020a056402249a00b00499cc326a52mr12698682eda.16.1673603143829; Fri, 13 Jan 2023 01:45:43 -0800 (PST) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id b4-20020a1709065e4400b00865ef3a3109sm1691681eju.66.2023.01.13.01.45.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 01:45:43 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Lunar][PATCH 4/5] UBUNTU: [Packaging] debian/rules: Clean up 'printenv' target output Date: Fri, 13 Jan 2023 10:45:36 +0100 Message-Id: <20230113094537.265143-5-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230113094537.265143-1-juerg.haefliger@canonical.com> References: <20230113094537.265143-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" The output of the 'printenv' target is misaligned and somewhat in random order. Fix the alignment and group the variables by 'type' and put the flag variables at the end. Signed-off-by: Juerg Haefliger --- debian/rules.d/1-maintainer.mk | 75 ++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 611587c1fdc7..f9aa57ab79ca 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -54,24 +54,39 @@ $(configs-targets): .PHONY: printenv printenv: - dh_testdir - @echo "src package name = $(src_pkg_name)" - @echo "series = $(series)" - @echo "release = $(release)" - @echo "revision = $(revision)" - @echo "uploadnum = $(uploadnum)" - @echo "prev_revision = $(prev_revision)" - @echo "abinum = $(abinum)" - @echo "upstream_tag = $(upstream_tag)" - @echo "variants = $(variants)" - @echo "flavours = $(flavours)" - @echo "do_skip_checks = $(do_skip_checks)" - @echo "do_dbgsym_package = $(do_dbgsym_package)" - @echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)" - @echo "ubuntu_selftests = $(ubuntu_selftests)" - @echo "bin package name = $(bin_pkg_name)" - @echo "hdr package name = $(hdrs_pkg_name)" - @echo "doc package name = $(doc_pkg_name)" + @dh_testdir + @echo "src_pkg_name = $(src_pkg_name)" + @echo "series = $(series)" + @echo "release = $(release)" + @echo "revision = $(revision)" + @echo "uploadnum = $(uploadnum)" + @echo "prev_revision = $(prev_revision)" + @echo "abinum = $(abinum)" + @echo "upstream_tag = $(upstream_tag)" + @echo "variants = $(variants)" + @echo "flavours = $(flavours)" + @echo "bin_pkg_name = $(bin_pkg_name)" + @echo "hdr_pkg_name = $(hdrs_pkg_name)" + @echo "doc_pkg_name = $(doc_pkg_name)" + @echo "libc_dev_version = $(libc_dev_version)" + @echo "ubuntu_selftests = $(ubuntu_selftests)" + @echo "arch = $(arch)" + @echo "kmake = $(kmake)" + @echo + @echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)" + @echo "DEB_HOST_GNU_TYPE = $(DEB_HOST_GNU_TYPE)" + @echo "DEB_BUILD_GNU_TYPE = $(DEB_BUILD_GNU_TYPE)" + @echo "DEB_HOST_ARCH = $(DEB_HOST_ARCH)" + @echo "DEB_BUILD_ARCH = $(DEB_BUILD_ARCH)" + @echo + @echo "any_signed = $(any_signed)" + @echo " uefi_signed = $(uefi_signed)" + @echo " opal_signed = $(opal_signed)" + @echo " sipl_signed = $(sipl_signed)" + @echo + @echo "do_skip_checks = $(do_skip_checks)" + @echo "do_full_build = $(do_full_build)" + @echo "do_dbgsym_package = $(do_dbgsym_package)" @echo "do_doc_package = $(do_doc_package)" @echo "do_doc_package_content = $(do_doc_package_content)" @echo "do_source_package = $(do_source_package)" @@ -85,25 +100,13 @@ printenv: @echo "do_tools = $(do_tools)" @echo "do_any_tools = $(do_any_tools)" @echo "do_linux_tools = $(do_linux_tools)" - @echo " do_tools_cpupower = $(do_tools_cpupower)" - @echo " do_tools_perf = $(do_tools_perf)" - @echo " do_tools_bpftool = $(do_tools_bpftool)" - @echo " do_tools_x86 = $(do_tools_x86)" - @echo " do_tools_host = $(do_tools_host)" + @echo " do_tools_cpupower = $(do_tools_cpupower)" + @echo " do_tools_perf = $(do_tools_perf)" + @echo " do_tools_bpftool = $(do_tools_bpftool)" + @echo " do_tools_x86 = $(do_tools_x86)" + @echo " do_tools_host = $(do_tools_host)" @echo "do_cloud_tools = $(do_cloud_tools)" - @echo " do_tools_hyperv = $(do_tools_hyperv)" - @echo "any_signed = $(any_signed)" - @echo " uefi_signed = $(uefi_signed)" - @echo " opal_signed = $(opal_signed)" - @echo " sipl_signed = $(sipl_signed)" - @echo "do_full_build = $(do_full_build)" - @echo "libc_dev_version = $(libc_dev_version)" - @echo "DEB_HOST_GNU_TYPE = $(DEB_HOST_GNU_TYPE)" - @echo "DEB_BUILD_GNU_TYPE = $(DEB_BUILD_GNU_TYPE)" - @echo "DEB_HOST_ARCH = $(DEB_HOST_ARCH)" - @echo "DEB_BUILD_ARCH = $(DEB_BUILD_ARCH)" - @echo "arch = $(arch)" - @echo "kmake = $(kmake)" + @echo " do_tools_hyperv = $(do_tools_hyperv)" .PHONY: printchanges printchanges: From patchwork Fri Jan 13 09:45:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1725844 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=S02eXDBh; 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 4Ntc492LGrz23gS for ; Fri, 13 Jan 2023 20:46:00 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pGGdC-0006u8-7f; Fri, 13 Jan 2023 09:45:50 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-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 1pGGd7-0006rd-G8 for kernel-team@lists.ubuntu.com; Fri, 13 Jan 2023 09:45:45 +0000 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.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-1.canonical.com (Postfix) with ESMTPS id 5453B3F764 for ; Fri, 13 Jan 2023 09:45:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1673603145; bh=v2J8/AxhsfvXjd7zL86bhEREsTqI5tFRPeF1FiMbXr0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=S02eXDBhID4B1HQGftrHqV015UCZhe64Bgg99WMLAviih/pqo38ORYJWH7IAvoaeo B6abicvFuVeZmy8b01sdetf2TJE3ih/ft/jLoIHTvaRB7liCHXtwhWun1AUbY0hF9c zGCjH+UmH0uht+RKXlXiiziwwAeviGoH/+ik+8QSH2GHJPLqExM9TKFiyBv75R3ogz RLJ7D4O1PJ71AaMjpZdT8aaxfGryG7LOJ2eaU5qb9QUZud/G16dCRvs3b5X6NDqYZI 7iVDwREm6QvWYTeRruci6gdkZWpJfNIuBAaVo2pN5093/7j1ZU+T3UQJSdGA1e8pqV +tX3FDVDGNkAg== Received: by mail-ej1-f70.google.com with SMTP id qa18-20020a170907869200b007df87611618so14537596ejc.1 for ; Fri, 13 Jan 2023 01:45:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=v2J8/AxhsfvXjd7zL86bhEREsTqI5tFRPeF1FiMbXr0=; b=2aDu4ony4yH4kUpSlQYBwNggohQZL9yYflH03kYc6LslcOVnFbFobjoUmFzj7LwH+L tCp5B5xDmDJT8Aqj9IGxNetCQUIjlpR0NUD9Ldx5wR+VaaY2r64XXT/z4ewhLnyaUk9o iG6YqNwcD5wk/3kao6T/Wd5W1kOFvoc4UivxlR93NPZtsL5YY3FFuZLxafU17vu/Tm8J 1kZqA6xv2KExJ2ka9dK7rbKgGfRKekmgx/LoCZqNqDQgaH5O2h75zkVhPpHV5kYbyBaO 2c6oJysdKkPkCh09whh/qfJhVkIYCW7pelrRpCWeMzE0VNAvsczWuJEMIx20Wht1AZ7A Oqrg== X-Gm-Message-State: AFqh2krabSZnmxuIf+TzFbwBPQvfdE/G+VbJ1Usef7LIpb1DUVwYsRQk TLbdozk+kVYWhB/WULdwynuhHhcGmpdotyzBLrONVLjBIMTvnuKKUADwwWE8LUGndFQpzXqTM2h CKh2E3gW8GR2Zh2ydr1Xap6+uOJ161xwNKAK3KVpwmw== X-Received: by 2002:a17:906:1299:b0:7c1:ee:5bca with SMTP id k25-20020a170906129900b007c100ee5bcamr64804614ejb.73.1673603145070; Fri, 13 Jan 2023 01:45:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXsoKDkoeUkQfwu1w9awVAuNdC2P0Oi1p6tfgcetMZ2g2cMRxc7Z8DWQKzhBjhqW0KRjgs9TPQ== X-Received: by 2002:a17:906:1299:b0:7c1:ee:5bca with SMTP id k25-20020a170906129900b007c100ee5bcamr64804602ejb.73.1673603144784; Fri, 13 Jan 2023 01:45:44 -0800 (PST) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id b4-20020a1709065e4400b00865ef3a3109sm1691681eju.66.2023.01.13.01.45.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 01:45:44 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Lunar][PATCH 5/5] UBUNTU: [Packaging] debian/rules: Add missing 'do_' variables to 'printenv' Date: Fri, 13 Jan 2023 10:45:37 +0100 Message-Id: <20230113094537.265143-6-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230113094537.265143-1-juerg.haefliger@canonical.com> References: <20230113094537.265143-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" Add all missing 'do_' variables to the output of the 'printenv' target. Signed-off-by: Juerg Haefliger --- debian/rules.d/1-maintainer.mk | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index f9aa57ab79ca..4d327ec3c478 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -85,12 +85,16 @@ printenv: @echo " sipl_signed = $(sipl_signed)" @echo @echo "do_skip_checks = $(do_skip_checks)" + @echo "do_enforce_all = $(do_enforce_all)" @echo "do_full_build = $(do_full_build)" + @echo "do_mainline_build = $(do_mainline_build)" @echo "do_dbgsym_package = $(do_dbgsym_package)" + @echo "do_dtbs = $(do_dtbs)" @echo "do_doc_package = $(do_doc_package)" @echo "do_doc_package_content = $(do_doc_package_content)" @echo "do_source_package = $(do_source_package)" @echo "do_source_package_content = $(do_source_package_content)" + @echo "do_extras_package = $(do_extras_package)" @echo "do_libc_dev_package = $(do_libc_dev_package)" @echo "do_flavour_image_package = $(do_flavour_image_package)" @echo "do_flavour_header_package = $(do_flavour_header_package)" @@ -98,15 +102,21 @@ printenv: @echo "do_full_source = $(do_full_source)" @echo "do_odm_drivers = $(do_odm_drivers)" @echo "do_tools = $(do_tools)" + @echo "do_tools_common = $(do_tools_common)" @echo "do_any_tools = $(do_any_tools)" @echo "do_linux_tools = $(do_linux_tools)" + @echo " do_tools_acpidbg = $(do_tools_acpidbg)" + @echo " do_tools_bpftool = $(do_tools_bpftool)" @echo " do_tools_cpupower = $(do_tools_cpupower)" + @echo " do_tools_host = $(do_tools_host)" @echo " do_tools_perf = $(do_tools_perf)" - @echo " do_tools_bpftool = $(do_tools_bpftool)" + @echo " do_tools_perf_jvmti = $(do_tools_perf_jvmti)" + @echo " do_tools_usbip = $(do_tools_usbip)" @echo " do_tools_x86 = $(do_tools_x86)" - @echo " do_tools_host = $(do_tools_host)" @echo "do_cloud_tools = $(do_cloud_tools)" @echo " do_tools_hyperv = $(do_tools_hyperv)" + @echo "do_dkms_wireguard = $(do_dkms_wireguard)" + @echo " do_wireguard_disable = $(do_wireguard_disable)" .PHONY: printchanges printchanges: