From patchwork Thu Jul 18 22:24:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Wager X-Patchwork-Id: 1962226 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 4WQ6nN6Kvtz1ySl for ; Fri, 19 Jul 2024 08:25:12 +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 1sUZYh-0002k8-If; Thu, 18 Jul 2024 22:25:07 +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 1sUZYf-0002jC-6h for kernel-team@lists.ubuntu.com; Thu, 18 Jul 2024 22:25:05 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (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 197AF4107F for ; Thu, 18 Jul 2024 22:25:05 +0000 (UTC) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-1fc4fcaa2e8so13425465ad.1 for ; Thu, 18 Jul 2024 15:25:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721341501; x=1721946301; 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=NVLdUKWRCRB2LiUNL44795Y1pGNH9QXl+cZG+vZzEAI=; b=VFu66ahqlCsQ1I5mXQn01SwVttB1J7Nb5/cw95+4wLLVrnCJKNyEV/ahW2z0C6tqmL TquBVIsH8+APUR/D5veJ2fyc/3w/vDK/KApFy1+w+REbHcVgoGkqV3oJRQNjG2oRLfKm 6NapXxXIguwdP6YK3PXUEV9r4TJZ7OQwPX883CXsSHgFW7UmCusq283j9+svlWDqiUbN FtHuOZi2nc1Ydgb+iwFUXmV8EPWtb67EaX6vQB4SoxvwurMDZD3Q51Of9Lxi2U4rldrp sz+mc0gHAXfyXojvzL0kPVYjNN2kOCfMb5NknjsFENXGXxYZdKQEjbr4Di4ZaOhZWAtM gUNQ== X-Gm-Message-State: AOJu0YzpP2LLYQMDSULEd88/JFNJ6uo7zfYD88YMIb1qHJZveoJnSHVz 7x4QOhgjenCjJkBuoUgpcMBKBQD4Vh5tLT7H+hbtzx8rYY0C/MTiwkkOepyt01Qmoh2Av+61xvP 8rV8reAgjVfD8hyfDdKB7nsSzTjIwUwPJSFZC7eEBdcOFAQhidDaT8aWe+OH+DHtaly2vDbOj63 7/BrE7vDboe/kM67w= X-Received: by 2002:a17:902:dace:b0:1fb:5c54:36c8 with SMTP id d9443c01a7336-1fc4e56c471mr52086025ad.50.1721341501430; Thu, 18 Jul 2024 15:25:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPuVnuvk+X0XFsGuTHyVcmfiwOqnWlHo22WOxmHs3xSZ58pAqif8J/XNaSOjH/X4Q3Dp+CeQ== X-Received: by 2002:a17:902:dace:b0:1fb:5c54:36c8 with SMTP id d9443c01a7336-1fc4e56c471mr52085875ad.50.1721341500929; Thu, 18 Jul 2024 15:25:00 -0700 (PDT) Received: from localhost ([2601:602:8c00:a08:fc81:339d:1473:e0c3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fd64b4a29bsm772095ad.15.2024.07.18.15.25.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jul 2024 15:25:00 -0700 (PDT) From: Noah Wager To: kernel-team@lists.ubuntu.com Subject: [SRU][N][PATCH 1/1] UBUNTU: [Packaging] Check do_lib_rust before linking Rust lib files Date: Thu, 18 Jul 2024 15:24:01 -0700 Message-ID: <20240718222433.64377-2-noah.wager@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240718222433.64377-1-noah.wager@canonical.com> References: <20240718222433.64377-1-noah.wager@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/2072592 Packages with falsy do_lib_rust still try to symlink the lib-rust package even though do_lib_rust prevents it from being generated. This results in a bad symlink in the headers (rust -> ../linux-lib-rust). It should check do_lib_rust before trying to link that directory. Signed-off-by: Noah Wager --- debian/rules.d/2-binary-arch.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 56658a97cb14..cda3522d7b5b 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -483,11 +483,13 @@ endif # Strip .so files (e.g., rust/libmacros.so) to reduce size even more find $(hdrdir) -name libmacros.so -exec strip -s {} \; +ifeq ($(do_lib_rust),true) # Generate Rust lib files install -d -m755 $(rustdir) mv $(hdrdir)/rust $(rustdir) # Generate symlink for Rust lib directory in headers $(SHELL) $(DROOT)/scripts/link-lib-rust "$(hdrdir)" "$(indeppkg)" "$*" +endif ifneq ($(do_full_build),false) # Clean out this flavours build directory.