From patchwork Fri Nov 24 13:28:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1868158 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 4ScG7543YJz1ySj for ; Sat, 25 Nov 2023 00:29:53 +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 1r6WFS-0007YL-Ih; Fri, 24 Nov 2023 13:29:35 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1r6WEr-0007RW-9K for kernel-team@lists.ubuntu.com; Fri, 24 Nov 2023 13:28:57 +0000 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (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 90AD240C4E for ; Fri, 24 Nov 2023 13:28:55 +0000 (UTC) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-54af4ac76adso427099a12.1 for ; Fri, 24 Nov 2023 05:28:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700832535; x=1701437335; 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=qhyGQLC3otkgxCUu/hOewSDj4x6K8G6Wvr0YQkH1hwY=; b=auxCbXJ1kLJFHYTcYidEF0yPaviFUrfzild97CaoIFx06dL5qiC7QpQRHZ3aHvwhmR Bs7/2ikvccKNNDB1dyjfo1ko0m9ouP4Dj0E/lYkmZO+d1v5aw2GTn4giuRM6RqCV4y99 Pr6oGFt2gDhMG61G2AEf3aFX5fg1TdMOJWovHcWx/3vv31E5Ru13rqI/e86PC4W8Yo6N eCGxJ2c5ZIrssV+k80Il39QhWWxkKMSkBh6/KfJIwBNsQJ03ydzad2QG/mj3GVvnKPZK Dfg1luKwyDJjUdqsB6+1o64QCyXpyXvMeQoD+szwwZYfzrZOmPaB05idbjk9NxkUtIxJ hWKw== X-Gm-Message-State: AOJu0Yxd9+IObCYi35F/2uIQjyCsOOkar0PepJAmMY5MAOExS8v+sywp AaQHxXfe9g4GvfH9jUjfu7CbDD6EqeCwfEwwrN73xq8EonXt4tnt2wD6DFKXr/BI4hWq3egCeQO jGrWZP+t8YQCTS/rulMqr2Sd/reJx/j2p6dqWVI1P71/+8O5m9A== X-Received: by 2002:a17:906:680a:b0:a01:9203:f7fe with SMTP id k10-20020a170906680a00b00a019203f7femr2161543ejr.26.1700832535088; Fri, 24 Nov 2023 05:28:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IGNT7qyP589ouTA0/m1FaY+KC/4XHfCYBczxB0nHb4ubbClKYM/yFhwnir8wzaFc+v6wsMo3A== X-Received: by 2002:a17:906:680a:b0:a01:9203:f7fe with SMTP id k10-20020a170906680a00b00a019203f7femr2161531ejr.26.1700832534846; Fri, 24 Nov 2023 05:28:54 -0800 (PST) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id r10-20020a1709067fca00b00a09b9893dbdsm488635ejs.56.2023.11.24.05.28.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 05:28:54 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Noble/Unstable][PATCH 2/6] UBUNTU: [Packaging] Remove obsolete config handling Date: Fri, 24 Nov 2023 14:28:32 +0100 Message-Id: <20231124132836.92441-3-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231124132836.92441-1-juerg.haefliger@canonical.com> References: <20231124132836.92441-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" Remove hopefully the last remaining leftovers from the old pre-annotations-only config scheme. While at it, drop the duplicate/redundant 'sed' call. Or am I missing something? Signed-off-by: Juerg Haefliger Acked-by: Masahiro Yamada --- debian/rules.d/2-binary-arch.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 0750fd9e8fc3..1cf2b106bf25 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -15,11 +15,7 @@ $(stampdir)/stamp-prepare-tree-%: debian/scripts/fix-filenames @echo Debug: $@ install -d $(builddir)/build-$* touch $(builddir)/build-$*/ubuntu-build - if [ -e $(commonconfdir)/config.common.ubuntu ]; then \ - cat $(commonconfdir)/config.common.ubuntu $(archconfdir)/config.common.$(arch) $(archconfdir)/config.flavour.$(target_flavour) > $(builddir)/build-$*/.config; \ - else \ - python3 debian/scripts/misc/annotations --export --arch $(arch) --flavour $(target_flavour) | sed -e 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(raw_kernelversion)"/' > $(builddir)/build-$*/.config; \ - fi + python3 debian/scripts/misc/annotations --export --arch $(arch) --flavour $(target_flavour) > $(builddir)/build-$*/.config sed -i 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(raw_kernelversion)"/' $(builddir)/build-$*/.config [ "$(do_odm_drivers)" = 'true' ] && true || \ sed -ie 's/.*CONFIG_UBUNTU_ODM_DRIVERS.*/# CONFIG_UBUNTU_ODM_DRIVERS is not set/' \