From patchwork Thu Jun 27 16:52:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Wager X-Patchwork-Id: 1953509 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 4W94Rr2DLWz20Xg for ; Fri, 28 Jun 2024 02:54:48 +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 1sMsOQ-00081b-Id; Thu, 27 Jun 2024 16:54:42 +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 1sMsOP-00081L-9y for kernel-team@lists.ubuntu.com; Thu, 27 Jun 2024 16:54:41 +0000 Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) (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 57E7D3F6BC for ; Thu, 27 Jun 2024 16:54:40 +0000 (UTC) Received: by mail-il1-f197.google.com with SMTP id e9e14a558f8ab-37625537d64so126308145ab.2 for ; Thu, 27 Jun 2024 09:54:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719507278; x=1720112078; 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=XGLJ3hWBYR0xfrc6X/9ywLz30/fPYQDPtzrnGw1jFz0=; b=Kv+I8IoTFMzEmEPxQm6PZD5ckFA2VZDcannF5pM43x77l+QjWxMVKs0SqPkh8kWAZ1 w0kVOQfk51DtnlrXqOoEJUzfjoyOZ6OQDu7RsXMbPIS+cwaV0d2YXEJ4ebkRigOvebHZ 6G0uPBUGAxY5/Qmg6yyHk1+cXKtiMjuIGU0C106yhHqoe4nsUBX6hQ6IYB/8VJgTJNUi tbdY4qGFFCCfUtR/n11w8CM1tgJoxnO6vql7BYYpMvAbTOGRIMP0ycST5KMh+K7V/Qgc f+dpSxzDtGAzBpcQ0XnIpGw1MBKckSFacCvReyZZWIV0Lkwtw1zOcrFMb197QoGZinjm wdjw== X-Gm-Message-State: AOJu0YyNfD5YNDDOxTx4iIhxMxtA21mXFuQkbXbBCzJxk+hGDJRet+uG qYa0jqC5XBOWlDw9ezKQv1CA1+l4G8ZvjH61qVo/XjxBSC9+SKrL/v9VQXWVmk+1T1SutFcCksP u52Bz/VRq4l3qjGjkI6Fdz1U5YGAW5Zm5gRn+hCpJ8OAP1XmRPQTcvXs3Vxoi+HRQlxyJNPWIay tRx2n/VgaReA== X-Received: by 2002:a05:6e02:144b:b0:375:a994:6de4 with SMTP id e9e14a558f8ab-3763f636baemr185361495ab.18.1719507278189; Thu, 27 Jun 2024 09:54:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHPTLCbA1UiUzMXbWDiUvMxbYxO1r56I7CD6gp9HRwbWMhalXwPUpygPVaRLnsFOnGD++eeSA== X-Received: by 2002:a05:6e02:144b:b0:375:a994:6de4 with SMTP id e9e14a558f8ab-3763f636baemr185361165ab.18.1719507277695; Thu, 27 Jun 2024 09:54:37 -0700 (PDT) Received: from localhost ([2601:602:8c00:a08:556e:7a0f:49ce:687a]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-727498549ebsm1278065a12.93.2024.06.27.09.54.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jun 2024 09:54:37 -0700 (PDT) From: Noah Wager To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 1/1] UBUNTU: [Packaging] Check do_lib_rust before linking Rust lib files Date: Thu, 27 Jun 2024 09:52:38 -0700 Message-ID: <20240627165346.78336-2-noah.wager@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240627165346.78336-1-noah.wager@canonical.com> References: <20240627165346.78336-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" 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 986a18d7abac..89d1eb769ed9 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -485,11 +485,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.