From patchwork Mon Oct 2 18:20:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cabaj X-Patchwork-Id: 1842273 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 4Rzq5J4Tk1z20Zh for ; Tue, 3 Oct 2023 05:20:51 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qnNX2-0000n0-TK; Mon, 02 Oct 2023 18:20:37 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qnNWq-0000mB-V1 for kernel-team@lists.ubuntu.com; Mon, 02 Oct 2023 18:20:25 +0000 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.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-0.canonical.com (Postfix) with ESMTPS id 89B3A41271 for ; Mon, 2 Oct 2023 18:20:24 +0000 (UTC) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-77435bbb71dso10734985a.1 for ; Mon, 02 Oct 2023 11:20:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696270823; x=1696875623; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cz9Mt8RedavGpCMai4cBEtNipGaIOUnoKxoqjyUhasg=; b=sUmDqzxT0SljqwOTuo7k7BEcA/+5TdYneSPEbbvI0jmI2GD0DffcWjgy/FE16CkDKo r8jcRlyf4QrffwC0m/+wBdGEI5CpfjXdCxrkJk5ZlrqYs0nl82nPFAsxZkoDrLoyuUz/ sRtgq1TBogrJ3YKotNqkMEK9mkS1G/xdd0aQzLpff7YzUIWYGYj55oJ4aDHuLjvpDPCy LlMnKYDsnQ3n93HtSIzqueYfH6w0iKtJagzPJH9KAhXwO0m0JHun1XSnqriAn5fw3R5W K1+Lzd8EgUZzH9iZxMNou+Un5sAQ86CgmxBkOZGUPtjwl/Jv4b7mGfyCdsewGv4WeFyM sHzw== X-Gm-Message-State: AOJu0Yya+h26KLo4iSwHISw7FFFluwNNHNuW+ocqZ1bCnGpp6o0uvUOm v/LmsoqjbU9Eco04J69AlWNIrTdOE7oMEX8dQSnuFwMiwdKhb1U+agZIYxMW2/0q35ZxRCYpP2S Q+1eb29W+2BX6ZoqVG8uMn6ErxDEhEAror0gGCyDx8t3uiu7YjQ== X-Received: by 2002:a05:620a:254b:b0:774:cd4:4a58 with SMTP id s11-20020a05620a254b00b007740cd44a58mr12309451qko.39.1696270823011; Mon, 02 Oct 2023 11:20:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFNZV9QpChHPlIlOI6eP84C82LwiFwsaoneSVMoTQ1NHJ6rKb/VKDlimHZi1oanT96yxy3Vtg== X-Received: by 2002:a05:620a:254b:b0:774:cd4:4a58 with SMTP id s11-20020a05620a254b00b007740cd44a58mr12309440qko.39.1696270822778; Mon, 02 Oct 2023 11:20:22 -0700 (PDT) Received: from smtp.gmail.com (h69-130-246-116.mdtnwi.broadband.dynamic.tds.net. [69.130.246.116]) by smtp.gmail.com with ESMTPSA id z31-20020a05620a261f00b00770f3e5618esm8148706qko.101.2023.10.02.11.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 11:20:22 -0700 (PDT) From: John Cabaj To: kernel-team@lists.ubuntu.com Subject: [SRU][m:unstable-meta][RFC 1/1] UBUNTU: [Packaging] Drop wireguard DKMS Date: Mon, 2 Oct 2023 13:20:20 -0500 Message-Id: <20231002182020.102342-2-john.cabaj@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231002182020.102342-1-john.cabaj@canonical.com> References: <20231002182020.102342-1-john.cabaj@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" Commit ed294cea82a6 in the main kernel package dropped Wireguard DKMS support. Reflecting that in the meta package to avoid error message during package building ("modinfo: ERROR: Module /lib/modules//kernel/drivers/net/wireguard/wireguard.ko not found") Signed-off-by: John Cabaj --- debian/rules | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/rules b/debian/rules index e20511f..c39adca 100755 --- a/debian/rules +++ b/debian/rules @@ -72,11 +72,6 @@ $(foreach _line,$(shell gawk '{ OFS = "!"; $$1 = $$1; print }' debian/dkms-versi ) \ ) dkms_virtualbox_version=$(KERNEL_ABI_VERSION) -ifeq ($(wildcard /lib/modules/$(KERNEL_ABI_VERSION)-generic/kernel/drivers/net/wireguard/wireguard.ko.zst),) - dkms_wireguard_version := $(shell /sbin/modinfo -F version /lib/modules/$(KERNEL_ABI_VERSION)-generic/kernel/drivers/net/wireguard/wireguard.ko) -else - dkms_wireguard_version := $(shell /sbin/modinfo -F version /lib/modules/$(KERNEL_ABI_VERSION)-generic/kernel/drivers/net/wireguard/wireguard.ko.zst) -endif debian/control.d/dkms-%: module = $(patsubst debian/control.d/dkms-%,%,$@) debian/control.d/dkms-%: module_archs = $(dkms_$(patsubst debian/control.d/dkms-%,%,$@)_archs) @@ -141,7 +136,6 @@ gencontrol_flags += \ ) \ ) gencontrol_flags += -Vdkms:virtualbox-guest-modules="virtualbox-guest-modules (= $(dkms_virtualbox_version))," -gencontrol_flags += -Vdkms:wireguard-linux-compat-modules="wireguard-modules (= $(dkms_wireguard_version))," build-%: :