From patchwork Mon Feb 14 10:29:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1592404 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=FU0FeAgX; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jy0q25063z9sCD for ; Mon, 14 Feb 2022 21:30:21 +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 1nJYcV-0006mg-EP; Mon, 14 Feb 2022 10:30:11 +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 1nJYcU-0006m7-4Q for kernel-team@lists.ubuntu.com; Mon, 14 Feb 2022 10:30:10 +0000 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.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 E0F3D3F1CA for ; Mon, 14 Feb 2022 10:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644834609; bh=MNt1beXcoKDxLnmYaQpsNs/1cS8g87tr3qXguyWvFlo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FU0FeAgXJzmVhUJlojdU1n2fX5xue5usoRdftr0aQACoSEHy0EVrWIC1DR3UoPkTO qp0XOwNXY3/qmIMUtGRP1ETIY6RPSorULQ++ydgNYLCK2VFIkCeexQYkHrkrHdztjD 1iN/aDntWglHBKC+JJGfCehjo9eCyKP6LqnzxFn1wYicHFZqpPwdQ+SWUOnQB9q2d+ saDIg2l5/mcCIKAdEW5stNaSuHnhGeiJhdmNSRxWEz9NLgloEVpMO6+tugVQvESDAs lGiui/nJZeSszSaJkxbnc/wnXu701aHYjZBPSW6CNVv4zkvA2ufGTjTxz8Xl5C7HiG dNwx2NnzmPitw== Received: by mail-ej1-f69.google.com with SMTP id hq19-20020a1709073f1300b006cdd7712c2cso2983433ejc.11 for ; Mon, 14 Feb 2022 02:30:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MNt1beXcoKDxLnmYaQpsNs/1cS8g87tr3qXguyWvFlo=; b=RgfPssO89QlKD5HHtzGcCTwfWcxmjgidI0DxAUHrAZ7ch4f6hih1ybGTkphID8abe1 MekjmhZUh8pFzV/t8uBqGpnM20xsGyu6SYuvtdBYPsR7pMe3smH65XH1kFkrE35jyb0o B9Gu/zBvZSfZPZjpTFeTSglQFsoFlnaz2+YJHcho0gZYdj5oeoL1VoOkMR66fgz6iUsb MfSMjxsquS2o3EfGCl58sA3K+ohwHrqVbDnfRjSnY3RiZe0tQ6e5iA0r6hZTnkLEbooT kSktZ7jZikugiyUylAmm+6/ApEIQ8qnwo35DYAivcVb5HHml90dwb+hSfYDhFtaI6nZS SY+A== X-Gm-Message-State: AOAM531k+qgq3BDJI9gtWyvy81dcnlcH7VpHjqzG+doMalWhYtpHAlls jbvT3SojOJgS3jKrbzIM4wfYWJWgcwKck7TXoU4ZVvmJBAvQvFJvwDdKkX0fLka82EsTfjzxCNB vkDllCzO8duHdR8Qq7cFogJHuKzFrlcrBch7PGcRx3A== X-Received: by 2002:a05:6402:42cd:: with SMTP id i13mr14682338edc.121.1644834609652; Mon, 14 Feb 2022 02:30:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyTNpRzOERRu9Dt60eaHky1CcgTrM8ebvVx8y++FAfIQzr7LYULJr5sSy4PzwTX7p6vMIW4nA== X-Received: by 2002:a05:6402:42cd:: with SMTP id i13mr14682327edc.121.1644834609521; Mon, 14 Feb 2022 02:30:09 -0800 (PST) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id o11sm413739edq.101.2022.02.14.02.30.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 02:30:09 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][J][devel][PATCH 1/2] UBUNTU: SAUCE: Makefile: Remove inclusion of lbm header files Date: Mon, 14 Feb 2022 11:29:35 +0100 Message-Id: <20220214102936.80935-2-juergh@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220214102936.80935-1-juergh@canonical.com> References: <20220214102936.80935-1-juergh@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" We haven't produced linux-headers-lbm packages in ages so stop trying to include their header files. Signed-off-by: Juerg Haefliger --- Makefile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Makefile b/Makefile index 20dc3216fea9..db3d9c4a5f58 100644 --- a/Makefile +++ b/Makefile @@ -490,13 +490,6 @@ CFLAGS_KERNEL = AFLAGS_KERNEL = LDFLAGS_vmlinux = -# Prefer linux-backports-modules -ifneq ($(KBUILD_SRC),) -ifneq ($(shell if test -e $(KBUILD_OUTPUT)/ubuntu-build; then echo yes; fi),yes) -UBUNTUINCLUDE := -I/usr/src/linux-headers-lbm-$(KERNELRELEASE) -endif -endif - # Use USERINCLUDE when you must reference the UAPI directories only. USERINCLUDE := \ -I$(srctree)/arch/$(SRCARCH)/include/uapi \ @@ -509,7 +502,6 @@ USERINCLUDE := \ # Use LINUXINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option LINUXINCLUDE := \ - $(UBUNTUINCLUDE) \ -I$(srctree)/arch/$(SRCARCH)/include \ -I$(objtree)/arch/$(SRCARCH)/include/generated \ $(if $(building_out_of_srctree),-I$(srctree)/include) \ From patchwork Mon Feb 14 10:29:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1592407 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=BUg/1YHJ; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jy0q25F93z9sFn for ; Mon, 14 Feb 2022 21:30:21 +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 1nJYcV-0006mw-MI; Mon, 14 Feb 2022 10:30:11 +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 1nJYcU-0006mT-P5 for kernel-team@lists.ubuntu.com; Mon, 14 Feb 2022 10:30:10 +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-0.canonical.com (Postfix) with ESMTPS id 90DC63F1B6 for ; Mon, 14 Feb 2022 10:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644834610; bh=iPMX0bumTjiIEY/u3d+BLhm2Rt0jgWr50Io92baNuL0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BUg/1YHJp5Wkffh1d3pQjaF+cUbspbKwbsGNov72CWlH0TOUC5Jdq9aP70T8qxwq5 W50VDXxaXMn9HKMEXpAtHUclq3mWykYEsgmvDw7vs+jlFEI4reAcpX+YuV8UnVJrWy g9SMoC/CrCpcZyGgJKd91vpLTJV8Vh/Ip/dSXH0mCwskDFkOHBDHMKKMrKVgLAYbqo HAmQSlor/92fJ5f/4KqK6q3NXuNENkw+fzmYSEajZt9PhMorCakBSQPqCEt5dA0Bcs B7F1f4gvOwhZQQfqLifrxnm3h6LsYLps2tfCH3AFzbyOCAuGhPRpWHgEvK37udXNxu vNRE3Teo4QBpQ== Received: by mail-ed1-f70.google.com with SMTP id b26-20020a056402139a00b004094fddbbdfso10006122edv.12 for ; Mon, 14 Feb 2022 02:30:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iPMX0bumTjiIEY/u3d+BLhm2Rt0jgWr50Io92baNuL0=; b=wtf/u7Tto6OpxI9Ig79stlhDNTJtQk2LOsee6ugYBf3L/dcnDNT3VWEyvpvt9eCFQY E91MrX2UhiE+vrK7MpCzo9VSTLly5Ul+8ZniNhcXnJ8sDoH6D8F5TqLqwkMhucho2/BU M/2syNoKyZz4GMbz1OzLfGmZdNkrKuEhy6ORBZwKHwXZIDsbKdCdQlJH5+qDSXn06KKU qx4BorEZ88GcqI5pyZ8OxQcMliTkSP64BZSi2iIfDwbq9QDUFXboHdj0An5158cJsyxa wv7B/VDWIdc86aiuYTSNIu6uE4fyW8DKa+OW+f/AoTNtYrOwPxhp0rIOFwMB2Ttxm69c kkzQ== X-Gm-Message-State: AOAM530g53c0WSQPnEfyISd1Dird4+V51EQ4a7OH+2FE9AAihyDrCGBa wB0/bMrlLAp/4E1bPex+ihz6bWuEMdZR35wvcJY9tBbgCud99Cyq7yv2czXvCPa+x6xvk6nXx2S MVhjRy3/bsLcyHXARFoO3ONIMBC+jlJkGK+pZv87mPA== X-Received: by 2002:a17:906:668b:: with SMTP id z11mr11079314ejo.690.1644834610304; Mon, 14 Feb 2022 02:30:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJxVKx/uvhwe/NUDZhWoC/tuy2EPDvKm7b5RP9id1wHobChw2ugk6bIzDi70dKFPq/9cR4QhoQ== X-Received: by 2002:a17:906:668b:: with SMTP id z11mr11079304ejo.690.1644834610087; Mon, 14 Feb 2022 02:30:10 -0800 (PST) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id o11sm413739edq.101.2022.02.14.02.30.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 02:30:09 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][J][devel][PATCH 2/2] UBUNTU: SAUCE: Makefile: Fix compiler warnings Date: Mon, 14 Feb 2022 11:29:36 +0100 Message-Id: <20220214102936.80935-3-juergh@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220214102936.80935-1-juergh@canonical.com> References: <20220214102936.80935-1-juergh@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" When building out-of-tree (which we do for package builds), the compiler emits the following warning: cc1: warning: ubuntu/include: No such file or directory [-Wmissing-include-dirs] Fix that by (always) using the absolute path of the include directory. Signed-off-by: Juerg Haefliger --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index db3d9c4a5f58..aca426cc63ba 100644 --- a/Makefile +++ b/Makefile @@ -509,7 +509,7 @@ LINUXINCLUDE := \ $(USERINCLUDE) # UBUNTU: Include our third party driver stuff too -LINUXINCLUDE += -Iubuntu/include $(if $(KBUILD_SRC),-I$(srctree)/ubuntu/include) +LINUXINCLUDE += -I$(srctree)/ubuntu/include KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \