From patchwork Fri Nov 24 13:28:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1868157 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 4ScG6d4hQfz1ySj for ; Sat, 25 Nov 2023 00:29:29 +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 1r6WF8-0007U3-7I; Fri, 24 Nov 2023 13:29:14 +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 1r6WEq-0007RS-A5 for kernel-team@lists.ubuntu.com; Fri, 24 Nov 2023 13:28:57 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.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 EE2943F62B for ; Fri, 24 Nov 2023 13:28:54 +0000 (UTC) Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a0009a87651so124213966b.1 for ; Fri, 24 Nov 2023 05:28:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700832534; x=1701437334; 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=qzhVdKZJdhAPG0ZS4A+bmTA3IuxmEQgq93/Ge/VBHYQ=; b=D0fOneLC5cnRrtn2XVd38ule+qztc31u8jLQNcELQiOMuvXk9/MBK3cwWnDhBpw30Y PKwjVK//wBvfWEWdwsVTOW4S2ysTOW9Tbgmi2dIzXa+YOir+ddAcj4WlqpLuOTMI637B RlQpCvFMs3flHUktkcvuTAI63MQAdb2+2a6nZyuQ8pWQ7mJfeq6lgTo5VCY4spkv2b8t u26IigZVEu+8XKacNaLJo5L6hlUHXad5a9U6F/jIW9vxWFmZE3gYzHwbMZeb27hQOHwS ZEVJ7Gq3YPww8vjQhTpkBeTPkcyN5DuT9bvMs6WYFtMftYTcls6/wFasRUOavMu1RWSL 4FaQ== X-Gm-Message-State: AOJu0YzeppP8l2akb8xwLvGgxLY33EiD7PG7yR1GITSNIQ4eXxCyNcwq tTqR5XvjA1GS/LErKHr2tQmu6yT/KZxPdf980yl9E6EMOXb/n395CyByhCzOaqZWaFi2+ZOdFM5 tbhKRhv0wshfiKskUEEJKkWEz5xh0jPyHWQQ7y/14505AbiwaDQ== X-Received: by 2002:a17:906:74c5:b0:a01:7745:467a with SMTP id z5-20020a17090674c500b00a017745467amr1827886ejl.4.1700832533961; Fri, 24 Nov 2023 05:28:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IG3OVauVutfLqS9MSayNAVs9Gj/zpr0RmkGAvKiNn4q2z6/ANm+RciGawr8msltl/fc2iNhyg== X-Received: by 2002:a17:906:74c5:b0:a01:7745:467a with SMTP id z5-20020a17090674c500b00a017745467amr1827875ejl.4.1700832533590; Fri, 24 Nov 2023 05:28:53 -0800 (PST) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id i17-20020a170906265100b009ff10bfcefbsm2060780ejc.106.2023.11.24.05.28.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 05:28:53 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Noble/Unstable][PATCH 1/6] UBUNTU: [Packaging] Remove do_full_source variable Date: Fri, 24 Nov 2023 14:28:31 +0100 Message-Id: <20231124132836.92441-2-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" do_full_source was introduced in Lucid but hasn't been used in ages, so remove it. This reverts commit 11fe82b00ff2428967c83055ba7ae8102f4140a6 ("UBUNTU: add configuration option for a full source build tree -- master") from lucid/linux. Signed-off-by: Juerg Haefliger Acked-by: Masahiro Yamada --- debian/rules.d/0-common-vars.mk | 3 --- debian/rules.d/2-binary-arch.mk | 25 +++++++------------------ 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index d62a9b063241..0c9df2b35893 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -161,9 +161,6 @@ endif # common headers normally is built as an indep package, but may be arch do_common_headers_indep=true -# add a 'full source' mode -do_full_source=false - # Add an option to enable special drivers which should only be build when # explicitly enabled. do_odm_drivers=false diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 098614c46b77..0750fd9e8fc3 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -1,15 +1,6 @@ # We don't want make removing intermediary stamps .SECONDARY : -# Prepare the out-of-tree build directory -ifeq ($(do_full_source),true) -build_cd = cd $(builddir)/build-$*; # -build_O = -else -build_cd = -build_O = O=$(builddir)/build-$* -endif - # TODO this is probably wrong, and should be using $(DEB_HOST_MULTIARCH) shlibdeps_opts = $(if $(CROSS_COMPILE),-- -l$(CROSS_COMPILE:%-=/usr/%)/lib) @@ -24,8 +15,6 @@ $(stampdir)/stamp-prepare-tree-%: debian/scripts/fix-filenames @echo Debug: $@ install -d $(builddir)/build-$* touch $(builddir)/build-$*/ubuntu-build - [ "$(do_full_source)" != 'true' ] && true || \ - rsync -a --exclude debian --exclude debian.master --exclude $(DEBIAN) * $(builddir)/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 \ @@ -36,8 +25,8 @@ $(stampdir)/stamp-prepare-tree-%: debian/scripts/fix-filenames sed -ie 's/.*CONFIG_UBUNTU_ODM_DRIVERS.*/# CONFIG_UBUNTU_ODM_DRIVERS is not set/' \ $(builddir)/build-$*/.config find $(builddir)/build-$* -name "*.ko" | xargs rm -f - $(build_cd) $(kmake) $(build_O) $(conc_level) rustavailable || true - $(build_cd) $(kmake) $(build_O) $(conc_level) olddefconfig + $(kmake) O=$(builddir)/build-$* $(conc_level) rustavailable || true + $(kmake) O=$(builddir)/build-$* $(conc_level) olddefconfig touch $@ # Used by developers as a shortcut to prepare a tree for compilation. @@ -52,12 +41,12 @@ $(stampdir)/stamp-build-%: target_flavour = $* $(stampdir)/stamp-build-%: bldimg = $(call custom_override,build_image,$*) $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-% @echo Debug: $@ build_image $(build_image) bldimg $(bldimg) - $(build_cd) $(kmake) $(build_O) $(conc_level) $(bldimg) modules $(if $(filter true,$(do_dtbs)),dtbs) + $(kmake) O=$(builddir)/build-$* $(conc_level) $(bldimg) modules $(if $(filter true,$(do_dtbs)),dtbs) ifeq ($(do_dbgsym_package),true) # The target scripts_gdb is part of "all", so we need to call it manually if grep -q CONFIG_GDB_SCRIPTS=y $(builddir)/build-$*/.config; then \ - $(build_cd) $(kmake) $(build_O) $(conc_level) scripts_gdb ; \ + $(kmake) O=$(builddir)/build-$* $(conc_level) scripts_gdb ; \ fi endif @@ -164,7 +153,7 @@ endif $(pkgdir)/boot/System.map-$(abi_release)-$* ifeq ($(do_dtbs),true) - $(build_cd) $(kmake) $(build_O) $(conc_level) dtbs_install \ + $(kmake) O=$(builddir)/build-$* $(conc_level) dtbs_install \ INSTALL_DTBS_PATH=$(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree endif @@ -174,7 +163,7 @@ ifeq ($(no_dumpfile),) chmod 0600 $(pkgdir)/boot/vmcoreinfo-$(abi_release)-$* endif - $(build_cd) $(kmake) $(build_O) $(conc_level) modules_install $(vdso) \ + $(kmake) O=$(builddir)/build-$* $(conc_level) modules_install $(vdso) \ INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=$(pkgdir)/ # @@ -287,7 +276,7 @@ ifeq ($(do_dbgsym_package),true) install -m644 -D $(builddir)/build-$*/scripts/gdb/linux/* \ --target-directory=$(dbgpkgdir)/usr/share/gdb/auto-load/boot/vmlinux-$(abi_release)-$*/scripts/gdb/linux; \ fi - $(build_cd) $(kmake) $(build_O) modules_install $(vdso) \ + $(kmake) O=$(builddir)/build-$* modules_install $(vdso) \ INSTALL_MOD_PATH=$(dbgpkgdir)/usr/lib/debug # Add .gnu_debuglink sections only after all/DKMS modules are built. rm -f $(dbgpkgdir)/usr/lib/debug/lib/modules/$(abi_release)-$*/build 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/' \ From patchwork Fri Nov 24 13:28:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1868159 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 4ScG7W4KRXz1yRy for ; Sat, 25 Nov 2023 00:30:15 +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 1r6WFm-0007kH-Dm; Fri, 24 Nov 2023 13:29:55 +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-0007Rb-Q3 for kernel-team@lists.ubuntu.com; Fri, 24 Nov 2023 13:28:58 +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 594E740C4F for ; Fri, 24 Nov 2023 13:28:57 +0000 (UTC) Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a02cc56af16so129803766b.3 for ; Fri, 24 Nov 2023 05:28:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700832536; x=1701437336; 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=9f7Kjv7Z3LgEDH58o8z/nLde9b9JjgAKplDq9vc6iKM=; b=n+SMdsf7SNooXMBN/CtWXP8wnEVYIBSE+Vllzs8x5CzzaXD3wF6GtmxAoEY4GTupnM Bb0f5Fj1FrX0ojgLSPqkwCzEuyzcPxZC8OoAzUJTj1rOF2SP6tlKrIzNtB/zuIiBSCf5 cLy2MmMTfC1LDnh1AlZf6ZJkD0hGtd+kxWcEyivd8vxZHUkzACXD5Jq9dtKsUHGt1y8T HaMpqhJmLA8pvjANVrEPr+k/KWlL5r4D4jMAqvbMCmdDtjAqTV95UepfN3nLHxKi8Xt2 AXSxs4Wu491MGnyd/3kgzcg4zzAH17aEgLRGlk4jYRHFD/wRsYfN90wGrcOPJCN8iq9B zmYQ== X-Gm-Message-State: AOJu0YySxKnZ2y+7Rx6Yb9YITZKcaHrZfqly6OV/yu1tM9zMRpzltK4V mnv5FavC0Cg3/ruRExH3AnTUf73bbgTUOA4ltJtmBMlT+JdQ4Fo6Dukc6gIMgQf0yqdXM05DSYz cAg/THuY3oMfJDOoHg+LDUkihbo+A9voMvW4K5qaywl6smicNQw== X-Received: by 2002:a17:906:1ca:b0:a00:152a:1ef8 with SMTP id 10-20020a17090601ca00b00a00152a1ef8mr2143840ejj.2.1700832536184; Fri, 24 Nov 2023 05:28:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IHFDxTuwVLQVnVlzPQpLPN1V7CF2tOWnnGMLA0P2whKCitqNdRY/xue2LWtAMuuC7HnYQ2aJg== X-Received: by 2002:a17:906:1ca:b0:a00:152a:1ef8 with SMTP id 10-20020a17090601ca00b00a00152a1ef8mr2143830ejj.2.1700832535932; Fri, 24 Nov 2023 05:28:55 -0800 (PST) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id f8-20020a17090624c800b009fd77d78f7fsm2065904ejb.116.2023.11.24.05.28.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 05:28:55 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Noble/Unstable][PATCH 3/6] UBUNTU: [Packaging] Remove support for sub-flavors Date: Fri, 24 Nov 2023 14:28:33 +0100 Message-Id: <20231124132836.92441-4-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" Sub-flavors were a concept in Maverick and earlier. In fact, it was removed later in Maverick but that commit was not carried forward to Natty so it's still here. Finally get rid of it. (forwardported from commit db54f0fec701e97b829f0abb2750c30464b38dec maverick/linux) Signed-off-by: Juerg Haefliger --- debian/rules | 2 +- debian/rules.d/2-binary-arch.mk | 18 --------- debian/scripts/control-create | 23 +++++------ debian/scripts/sub-flavour | 69 --------------------------------- 4 files changed, 10 insertions(+), 102 deletions(-) delete mode 100644 debian/scripts/sub-flavour diff --git a/debian/rules b/debian/rules index 70ad432a2e90..57595186fcc6 100755 --- a/debian/rules +++ b/debian/rules @@ -192,7 +192,7 @@ $(DEBIAN)/control.stub: \ debian/canonical-revoked-certs.pem \ $(DROOT)/control.d/flavour-module.stub \ $(DEBIAN)/changelog \ - $(wildcard $(DEBIAN)/control.d/* $(DEBIAN)/sub-flavours/*.vars) + $(wildcard $(DEBIAN)/control.d/*) for i in $(control_files); do \ cat $$i; \ echo ""; \ diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 1cf2b106bf25..f1950bbdcb92 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -251,17 +251,6 @@ ifeq ($(do_doc_package),true) chmod 644 $(bindoc)/changelog.Debian.old.gz endif -ifneq ($(skipsub),true) - for sub in $($(*)_sub); do \ - if ! (TO=$$sub FROM=$* ABI_RELEASE=$(abi_release) $(SHELL) \ - $(DROOT)/scripts/sub-flavour); then exit 1; fi; \ - /sbin/depmod -b debian/$(bin_pkg_name)-$$sub \ - -ea -F debian/$(bin_pkg_name)-$$sub/boot/System.map-$(abi_release)-$* \ - $(abi_release)-$*; \ - $(call install_control,$(bin_pkg_name)--$$sub,image,postinst postrm preinst prerm); \ - done -endif - ifeq ($(do_dbgsym_package),true) # Debug image is simple install -m644 -D $(builddir)/build-$*/vmlinux \ @@ -633,13 +622,6 @@ ifeq ($(do_lib_rust),true) $(call dh_all,$(pkgrust)) endif -ifneq ($(skipsub),true) - @set -e; for sub in $($(*)_sub); do \ - pkg=$(bin_pkg_name)-$$sub; \ - $(call dh_all_inline,$$pkg); \ - done -endif - ifeq ($(do_dbgsym_package),true) $(call dh_all,$(dbgpkg)) -- -Zxz diff --git a/debian/scripts/control-create b/debian/scripts/control-create index 5d0e3e46556c..32ef0f2df536 100755 --- a/debian/scripts/control-create +++ b/debian/scripts/control-create @@ -9,21 +9,16 @@ any_signed=$2 [ "$provides" != '' ] && provides="$provides, " -if [ "$is_sub" = "" ]; then - flavour=$(basename $vars | sed 's/.*\.//') - stub="${DEBIAN}/control.d/flavour-control.stub debian/control.d/flavour-buildinfo.stub" - if [ "$any_signed" = 'true' ]; then - sign_me_pkg="-unsigned" - sign_me_txt=" unsigned" - sign_peer_pkg="" - else - sign_me_pkg="" - sign_me_txt="" - sign_peer_pkg="-unsigned" - fi +flavour=$(basename $vars | sed 's/.*\.//') +stub="${DEBIAN}/control.d/flavour-control.stub debian/control.d/flavour-buildinfo.stub" +if [ "$any_signed" = 'true' ]; then + sign_me_pkg="-unsigned" + sign_me_txt=" unsigned" + sign_peer_pkg="" else - flavour=$(basename $vars .vars) - stub=${DEBIAN}/sub-flavours/control.stub + sign_me_pkg="" + sign_me_txt="" + sign_peer_pkg="-unsigned" fi cat $stub | grep -v '^#' | sed \ diff --git a/debian/scripts/sub-flavour b/debian/scripts/sub-flavour deleted file mode 100644 index 01004939617c..000000000000 --- a/debian/scripts/sub-flavour +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash - -. debian/debian.env - -echo "SUB_PROCESS $FROM => $TO" - -export from_pkg="linux-image-$ABI_RELEASE-$FROM" -export to_pkg="linux-image-$ABI_RELEASE-$TO" - -from_moddir="debian/$from_pkg/lib/modules/$ABI_RELEASE-$FROM" -to_moddir="debian/$to_pkg/lib/modules/$ABI_RELEASE-$FROM" - -install -d "debian/$to_pkg/boot" -install -m644 debian/$from_pkg/boot/config-$ABI_RELEASE-$FROM \ - debian/$to_pkg/boot/ -install -m600 debian/$from_pkg/boot/{vmlinuz,System.map}-$ABI_RELEASE-$FROM \ - debian/$to_pkg/boot/ - -# -# Print some warnings if there are files in the sub-flavours list -# that do not actually exist. -# -cat ${DEBIAN}/sub-flavours/$TO.list | while read line -do -( - cd debian/$from_pkg/lib/modules/$ABI_RELEASE-$FROM/kernel; - # - # If its a wildcard, then check that there are files that match. - # - if echo "$line" | grep '\*' > /dev/null - then - if [ `eval find "$line" -name '*.ko' 2>/dev/null|wc -l` -lt 1 ] - then - echo SUB_INST Warning - No files in $line - fi - # - # Else it should be a single file reference. - # - elif [ ! -f "$line" ] - then - echo SUB_INST Warning - could not find "$line" - fi -) -done - -cat ${DEBIAN}/sub-flavours/$TO.list | while read line; do - ( - cd debian/$from_pkg/lib/modules/$ABI_RELEASE-$FROM/kernel; - if echo "$line" | grep '\*' > /dev/null - then - eval find "$line" -name '*.ko' 2>/dev/null || true - elif [ -f "$line" ] - then - echo "$line" - fi - ); -done | while read mod; do - echo "SUB_INST checking: $mod" - fromdir="/lib/modules/$ABI_RELEASE-$FROM/" - egrep "^($fromdir)?kernel/$mod:" \ - $from_moddir/modules.dep | sed -e "s|^$fromdir||" -e 's/://' -e 's/ /\n/g' | \ - while read m; do - m="${fromdir}$m" - test -f debian/$to_pkg/$m && continue - echo "SUB_INST installing: $m" - install -D -m644 debian/$from_pkg/$m \ - debian/$to_pkg/$m - done -done From patchwork Fri Nov 24 13:28:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1868161 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 4ScG8B14mzz1yRy for ; Sat, 25 Nov 2023 00:30:50 +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 1r6WGW-0008An-QG; Fri, 24 Nov 2023 13:30:41 +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 1r6WEt-0007Rq-9r for kernel-team@lists.ubuntu.com; Fri, 24 Nov 2023 13:29:00 +0000 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (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 E5B203F885 for ; Fri, 24 Nov 2023 13:28:58 +0000 (UTC) Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a02ccc2fb53so132625666b.1 for ; Fri, 24 Nov 2023 05:28:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700832537; x=1701437337; 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=lB0G5fSgSIJngjuDBCeeMmHnVHREH4eUi4cVcm1Esvg=; b=jun08uTVIfofmmHJZpJvS7V/n0VarW8BEwBDP7iIPWcHEMPMQAqyA5zKyp0BT3qCsP vgotTib6sQGPDfIL27f40nC4P5Qz2216c0BF+hukXl+4C8hqPiUE7lpL1P25QUopzrgt 4L+2NpFrKzSFS/o+K7jPGmb0mOZ+k9CyU2u8KXGhlqvDl/gZ4uE8xEEx31WLsciNtyGh 8OUUbU9+obDPWLukagBklBSjlI1ktktKJXR0EuBoYe5jOorE2mPCiZ3qPnA6FyLOpd5z 4ip9TCQ1vaziwYXEhaQu+y59cwst2vsEfzEdFRP8C4sSjwtgxQ7oFJCEyiTWhVAQ9RQv lwxQ== X-Gm-Message-State: AOJu0YzF8sdRbDvp/kJYzwiHqs34t9blfnYxEYRMIKknAPdZdZmNZK+I B67fiRUUcvzE3fm6Gd/cz/oERTwbsmBU/q0wcYGNQ8QQr45R8ASj4KstUB0pVFZPUzS3YumsTqW 41vXSLMVbEZyYg5Z+GVH137I5Kir4K0UPSd6lzSY4SJt8qIsKaw== X-Received: by 2002:a17:907:ea5:b0:9fc:93e1:c6bc with SMTP id ho37-20020a1709070ea500b009fc93e1c6bcmr2415596ejc.33.1700832537375; Fri, 24 Nov 2023 05:28:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IGk+2ByS33Kduqzk0Ko2boJf6zivwcSe0QbOtxEhw00uIauA+MMf5t2FTdjj7bhvZTmqpF/og== X-Received: by 2002:a17:907:ea5:b0:9fc:93e1:c6bc with SMTP id ho37-20020a1709070ea500b009fc93e1c6bcmr2415589ejc.33.1700832537169; Fri, 24 Nov 2023 05:28:57 -0800 (PST) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id rv24-20020a17090710d800b00a0958af2387sm670704ejb.201.2023.11.24.05.28.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 05:28:56 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Noble/Unstable][PATCH 4/6] UBUNTU: [Packaging] Remove old linux-libc-dev version hack Date: Fri, 24 Nov 2023 14:28:34 +0100 Message-Id: <20231124132836.92441-5-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" Back in the 2.6.35 days, there was some broken linux-libc-dev package versioning that needed to be hacked around. Finally get rid of it 13 years later... Signed-off-by: Juerg Haefliger Acked-by: Masahiro Yamada --- debian/rules.d/0-common-vars.mk | 12 ------------ debian/rules.d/1-maintainer.mk | 1 - 2 files changed, 13 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 0c9df2b35893..4e376c3f82ed 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -66,18 +66,6 @@ ifneq ($(do_full_build),false) uploadnum := $(uploadnum)-Ubuntu endif -# XXX: linux-libc-dev got bumped to -803.N inadvertantly by a ti-omap4 upload -# shift our version higher for this package only. Ensure this only -# occurs for the v2.6.35 kernel so that we do not propogate this into -# any other series. -raw_uploadnum := $(shell echo $(revision) | sed -e 's/.*\.//') -libc_dev_version := -ifeq ($(DEBIAN),debian.master) -ifeq ($(release),2.6.35) -libc_dev_version := -v$(release)-$(shell expr "$(abinum)" + 1000).$(raw_uploadnum) -endif -endif - DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 820c14139947..a5ea2241be79 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -49,7 +49,6 @@ printenv: @echo "hdr_pkg_name = $(hdrs_pkg_name)" @echo "rust_pkg_name = $(rust_pkg_name)" @echo "doc_pkg_name = $(doc_pkg_name)" - @echo "libc_dev_version = $(libc_dev_version)" @echo "ubuntu_selftests = $(ubuntu_selftests)" @echo "arch = $(arch)" @echo "kmake = $(kmake)" From patchwork Fri Nov 24 13:28:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1868160 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 4ScG813fxtz1yRy for ; Sat, 25 Nov 2023 00:30:41 +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 1r6WGG-0007vc-Qn; Fri, 24 Nov 2023 13:30:25 +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 1r6WEt-0007Rr-N9 for kernel-team@lists.ubuntu.com; Fri, 24 Nov 2023 13:29:00 +0000 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.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-1.canonical.com (Postfix) with ESMTPS id 724D03F62B for ; Fri, 24 Nov 2023 13:28:59 +0000 (UTC) Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9fd114e21adso140498666b.3 for ; Fri, 24 Nov 2023 05:28:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700832539; x=1701437339; 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=WwhsgaVIs2/4BSsP3rVdfvOp3TmJBWeOAwxwPgK8WvA=; b=YDxs+jCxKByt8+uO+Zs2TmNhXdDpwIkoBOdTJoYjROAxuR7VwsfZKggmbMHWWUCDkE ivnWROmTnEkOZWypEr2KXsBazT/BQFDQ2n3QNllVg0JyX/2P1TUOf8b+af0BsV1Vaggp 7NQkYZXU8mh6iw+qitaD0DfnTKN09QkCbbpH4E/TGgCs6wlgo2LeS7/KtdYjk/jlmVk8 /jAXVf9u5Hb907LvyfO3xDvUhAiD6Um3okphZkFytwI6PSdWbec1iuFaK+tSlDLlVuKK utY34kzwZT4ckRA8BcQvTTYh3Uzs8ltK/82wewzbDoCGPW4UTIxZCJJplElbYTch5FxX jGPQ== X-Gm-Message-State: AOJu0YyT6pneBCRgIvWZU86SX2PbJ0A/lrhkva7MGLduf6xwkhro+Ajq 8J/+l4GSVOHIfAPvAv/lRL/MtST5dif0FDF7t6jDG4arzGmxRTLAMoULd5x4BBGjjGShV5iAVnv Za35V75Mp7jSHr9J/9xa1FROV+bNNHo9Vrfb/mhWetPDBZtejpg== X-Received: by 2002:a17:906:1044:b0:a02:9108:71cd with SMTP id j4-20020a170906104400b00a02910871cdmr1902581ejj.0.1700832538925; Fri, 24 Nov 2023 05:28:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFeECEuuzbdjbCq4g3DbL8XXyeiUkbndWr5/UAXc+JOJQ5/2QNIQ+mzEYPBVsxeQkpEcuD2IA== X-Received: by 2002:a17:906:1044:b0:a02:9108:71cd with SMTP id j4-20020a170906104400b00a02910871cdmr1902564ejj.0.1700832538433; Fri, 24 Nov 2023 05:28:58 -0800 (PST) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id e27-20020a1709062c1b00b009fda627abd9sm2046563ejh.79.2023.11.24.05.28.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 05:28:58 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Noble/Unstable][PATCH 5/6] UBUNTU: [Packaging] Remove obsolete scripts Date: Fri, 24 Nov 2023 14:28:35 +0100 Message-Id: <20231124132836.92441-6-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 the following old scripts which are no longer used: - fw-to-ihex.sh - insert-mainline-changes - retag - sanitize-annotations - splitconfig.pl - update-aufs.sh Signed-off-by: Juerg Haefliger --- debian.master/reconstruct | 6 -- debian/scripts/misc/fw-to-ihex.sh | 18 ---- debian/scripts/misc/insert-mainline-changes | 42 -------- debian/scripts/misc/retag | 34 ------- debian/scripts/misc/sanitize-annotations | 49 --------- debian/scripts/misc/splitconfig.pl | 107 -------------------- debian/scripts/misc/update-aufs.sh | 50 --------- 7 files changed, 306 deletions(-) delete mode 100755 debian/scripts/misc/fw-to-ihex.sh delete mode 100755 debian/scripts/misc/insert-mainline-changes delete mode 100755 debian/scripts/misc/retag delete mode 100755 debian/scripts/misc/sanitize-annotations delete mode 100755 debian/scripts/misc/splitconfig.pl delete mode 100755 debian/scripts/misc/update-aufs.sh diff --git a/debian.master/reconstruct b/debian.master/reconstruct index fcb5bd1a70e2..8d1b2770fff8 100644 --- a/debian.master/reconstruct +++ b/debian.master/reconstruct @@ -23,18 +23,12 @@ chmod +x 'debian/scripts/link-lib-rust' chmod +x 'debian/scripts/misc/annotations' chmod +x 'debian/scripts/misc/arch-has-odm-enabled.sh' chmod +x 'debian/scripts/misc/find-missing-sauce.sh' -chmod +x 'debian/scripts/misc/fw-to-ihex.sh' chmod +x 'debian/scripts/misc/gen-auto-reconstruct' chmod +x 'debian/scripts/misc/getabis' chmod +x 'debian/scripts/misc/git-ubuntu-log' chmod +x 'debian/scripts/misc/insert-changes' -chmod +x 'debian/scripts/misc/insert-mainline-changes' chmod +x 'debian/scripts/misc/insert-ubuntu-changes' chmod +x 'debian/scripts/misc/kernelconfig' -chmod +x 'debian/scripts/misc/retag' -chmod +x 'debian/scripts/misc/sanitize-annotations' -chmod +x 'debian/scripts/misc/splitconfig.pl' -chmod +x 'debian/scripts/misc/update-aufs.sh' chmod +x 'debian/scripts/module-inclusion' chmod +x 'debian/scripts/retpoline-extract' chmod +x 'debian/scripts/retpoline-extract-one' diff --git a/debian/scripts/misc/fw-to-ihex.sh b/debian/scripts/misc/fw-to-ihex.sh deleted file mode 100755 index a63fe67b4f5d..000000000000 --- a/debian/scripts/misc/fw-to-ihex.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -F=$1 -if [ "$F" = "" ] -then - echo You must supply a firmware file. - exit 1 -fi - -echo "unsigned char d[] = {" > $F.c -hexdump -v -e '"\t" 8/1 "0x%02x, " "\n"' $F >> $F.c -echo "};" >> $F.c -sed -i 's/0x .*$//' $F.c - -O="`dirname $F`/`basename $F`.o" -gcc -o $O -c $F.c -objcopy -Oihex $F.o $F.ihex - diff --git a/debian/scripts/misc/insert-mainline-changes b/debian/scripts/misc/insert-mainline-changes deleted file mode 100755 index 5678b1031e54..000000000000 --- a/debian/scripts/misc/insert-mainline-changes +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/perl - -if ($#ARGV != 2) { - warn "Usage: $0 \n"; - die " $0 debian.master/changelog v3.2.3 v3.2.2..v3.2.3\n"; -} -my ($changelog, $to, $range) = @ARGV; - -my @changes = (); - -push(@changes, "\n"); -push(@changes, " [ Upstream Kernel Changes ]\n\n"); -push(@changes, " * rebase to $to\n"); - -open(LOG, "git log '$range'|") || die "$0: git log failed: - $!\n"; -while () { - if (m@BugLink: .*launchpad.net/.*/([0-9]+)\s$@) { - push(@changes, " - LP: #$1\n"); - } -} -close(LOG); - -open(CHANGELOG, "< $changelog") or die "Cannot open changelog"; -open(NEW, "> $changelog.new") or die "Cannot open new changelog"; - -$printed = 3; -while () { - if (/^ CHANGELOG: /) { - $printed--; - print NEW; - if ($printed == 0) { - print NEW @changes; - } - next; - } - print NEW; -} - -close(NEW); -close(CHANGELOG); - -rename("$changelog.new", "$changelog"); diff --git a/debian/scripts/misc/retag b/debian/scripts/misc/retag deleted file mode 100755 index 94cf169a0769..000000000000 --- a/debian/scripts/misc/retag +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/perl -w - -open(TAGS, "git tag -l |") or die "Could not get list of tags"; -@tags = ; -close(TAGS); - -open(LOGS, "git log --pretty=short |") or die "ERROR: Calling git log"; -my $commit = ""; - -while () { - my $origtag; - - if (m|^commit (.*)$|) { - $commit = $1; - next; - } - - m|\s*UBUNTU: (Ubuntu-2\.6\..*)| or next; - - $tag = $1; - - ($origtag) = grep(/^$tag.orig$/, @tags); - - if (!defined($origtag)) { - print "I: Adding original tag for $tag\n"; - system("git tag -m $tag $tag.orig $tag"); - } - - print "I: Tagging $tag => $commit\n"; - - system("git tag -f -m $tag $tag $commit"); -} - -close(LOGS); diff --git a/debian/scripts/misc/sanitize-annotations b/debian/scripts/misc/sanitize-annotations deleted file mode 100755 index 2814f00e8fad..000000000000 --- a/debian/scripts/misc/sanitize-annotations +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env python3 -# -# Try to automatically sanitize an old "annotations" file, dropping all the -# deprecated flags, arbitrary enforcements rules, etc. -# -# Usage: -# $ ./sanitize-annotations debian.master/config/annotations - -import sys -import re - - -def remove_flags_and_drop_lines(file_path): - # Read the contents of the file - with open(file_path, "r", encoding="utf-8") as file: - content = file.read() - - # Check if the file has the required headers - lines = content.splitlines() - if ( - len(lines) < 2 - or lines[0].strip() != "# Menu: HEADER" - or lines[1].strip() != "# FORMAT: 4" - ): - print(f"ERROR: {file_path} doesn't have a valid header") - print("Fix the headers as explained here: " + - "https://docs.google.com/document/d/1NnGC2aknyy2TJWMsoYzhrZMr9rYMA09JQBEvC-LW_Lw/") - sys.exit(1) - - # Remove unsupported annotations - updated_content = re.sub(r"(flag|mark)<.*?>", "", content) - - # Drop lines with a single word and trailing spaces - updated_content = re.sub(r"^\w+\s*$", "", updated_content, flags=re.MULTILINE) - - # Add a space after all caps followed by 'policy' - updated_content = re.sub(r"([A-Z]+)(policy)", r"\1 \2", updated_content) - - # Add 'note' if missing - updated_content = re.sub(r"(\s+)(<.*?>)", r"\1note\2", updated_content) - - # Write the updated contents back to the file - with open(file_path, "w", encoding="utf-8") as file: - file.write(updated_content) - - -if __name__ == "__main__": - file_path = sys.argv[1] - remove_flags_and_drop_lines(file_path) diff --git a/debian/scripts/misc/splitconfig.pl b/debian/scripts/misc/splitconfig.pl deleted file mode 100755 index 3270edeb4e01..000000000000 --- a/debian/scripts/misc/splitconfig.pl +++ /dev/null @@ -1,107 +0,0 @@ -#!/usr/bin/perl -w - -%allconfigs = (); -%common = (); - -print "Reading config's ...\n"; - -for $config (@ARGV) { - # Only config.* - next if $config !~ /^config\..*/; - # Nothing that is disabled, or remnant - next if $config =~ /.*\.(default|disabled|stub)$/; - - %{$allconfigs{$config}} = (); - - print " processing $config ... "; - - open(CONFIG, "< $config"); - - while () { - # Skip comments - /^#*\s*CONFIG_(\w+)[\s=](.*)$/ or next; - - ${$allconfigs{$config}}{$1} = $2; - - $common{$1} = $2; - } - - close(CONFIG); - - print "done.\n"; -} - -print "\n"; - -print "Merging lists ... \n"; - -# %options - pointer to flavour config inside the allconfigs array -for $config (keys(%allconfigs)) { - my %options = %{$allconfigs{$config}}; - - print " processing $config ... "; - - for $key (keys(%common)) { - next if not defined $common{$key}; - - # If we don't have the common option, then it isn't - # common. If we do have that option, it must have the same - # value. EXCEPT where this file does not have a value at all - # which may safely be merged with any other value; the value - # will be elided during recombination of the parts. - if (!defined($options{$key})) { - # Its ok really ... let it merge - } elsif (not defined($options{$key})) { - undef $common{$key}; - } elsif ($common{$key} ne $options{$key}) { - undef $common{$key}; - } - } - - print "done.\n"; -} - -print "\n"; - -print "Creating common config ... "; - -open(COMMON, "> config.common"); -print COMMON "#\n# Common config options automatically generated by splitconfig.pl\n#\n"; - -for $key (sort(keys(%common))) { - if (not defined $common{$key}) { - print COMMON "# CONFIG_$key is UNMERGABLE\n"; - } elsif ($common{$key} eq "is not set") { - print COMMON "# CONFIG_$key is not set\n"; - } else { - print COMMON "CONFIG_$key=$common{$key}\n"; - } -} -close(COMMON); - -print "done.\n\n"; - -print "Creating stub configs ...\n"; - -for $config (keys(%allconfigs)) { - my %options = %{$allconfigs{$config}}; - - print " processing $config ... "; - - open(STUB, "> $config"); - print STUB "#\n# Config options for $config automatically generated by splitconfig.pl\n#\n"; - - for $key (sort(keys(%options))) { - next if defined $common{$key}; - - if ($options{$key} =~ /^is /) { - print STUB "# CONFIG_$key $options{$key}\n"; - } else { - print STUB "CONFIG_$key=$options{$key}\n"; - } - } - - close(STUB); - - print "done.\n"; -} diff --git a/debian/scripts/misc/update-aufs.sh b/debian/scripts/misc/update-aufs.sh deleted file mode 100755 index 83bbbff8ea69..000000000000 --- a/debian/scripts/misc/update-aufs.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -AUFS=aufs4-standalone - -# -# Before you run this be sure you've removed or reverted the 'UBUNTU: SAUCE: AUFS" patch. -# -# -# Make sure the current working directory is at the top of the -# linux tree. -# -if ! grep PATCHLEVEL Makefile -then - echo "You must run this script from the top of the linux tree" - exit 1 -fi - -clean=0 -if [ "$#" = 1 ]; then - AUFS="$1" -else - clean=1 - rm -rf ${AUFS} - git clone https://github.com/sfjro/aufs5-standalone.git ${AUFS} - (cd ${AUFS}; git checkout -b aufs5.x-rcN remotes/origin/aufs5.x-rcN) -fi - -cp ${AUFS}/include/uapi/linux/aufs_type.h include/uapi/linux -rsync -av ${AUFS}/fs/ fs/ -rsync -av ${AUFS}/Documentation/ Documentation/ - -PATCHES="${PATCHES} aufs5-kbuild.patch" -PATCHES="${PATCHES} aufs5-base.patch" -PATCHES="${PATCHES} aufs5-mmap.patch" -PATCHES="${PATCHES} aufs5-standalone.patch" -PATCHES="${PATCHES} aufs5-loopback.patch" -#PATCHES="${PATCHES} vfs-ino.patch" -#PATCHES="${PATCHES} tmpfs-idr.patch" - -for i in ${PATCHES} -do - patch -p1 < ${AUFS}/$i -done - -[ "$clean" = 1 ] && rm -rf ${AUFS} -git add mm/prfile.c -git add -u -find . -name "*.orig" | xargs rm -find . |grep aufs | xargs git add -git commit -s -m"UBUNTU: SAUCE: AUFS" From patchwork Fri Nov 24 13:28:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1868162 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 4ScG8M1bd9z1yRy for ; Sat, 25 Nov 2023 00:30:59 +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 1r6WGd-0008Gh-6g; Fri, 24 Nov 2023 13:30:48 +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 1r6WEu-0007Rz-RZ for kernel-team@lists.ubuntu.com; Fri, 24 Nov 2023 13:29:05 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.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-0.canonical.com (Postfix) with ESMTPS id 92CA4406D3 for ; Fri, 24 Nov 2023 13:29:00 +0000 (UTC) Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a00c4043a41so142229266b.0 for ; Fri, 24 Nov 2023 05:29:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700832539; x=1701437339; 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=5BKDj64HrUS7Clq/cK7MsZE9KxtMr9A715XCfpsJ89Y=; b=Q3WQsfIcipnh+OiaILW+9GD3fhIMeNl9HbDEVvqDsAmI+kL/I4pWA5zTe0eB4gUkNo GWhFNUIP0lh1KEY8OWbFkSl9xes6PdnuBJloczhzOb899EFGBYXErc3cE0NjDkBXTrNL PGsdiRUsDHdP8RZoF6SK2j9wJS4FbS23srEsQd9LCtLHCrNEcyRm+s5TDKuPPb5zzEnb nut/RyrotjN5YDUhOWk7vIqPxwzQh2mKLos7NNhsyt5i8X6THZ7eR2TDTkhrj9UQx5YL iuLq+tVuFUk+HnD6pViI38uY7cBmwbrNLFfcl7gMoiYLVf+8NlXsSYwplztwFAoSR9er p8mA== X-Gm-Message-State: AOJu0Yw3flWEy1nq53KSM4CXdrorpOeelxtDoRaFhtnA49s7oF8Tlla3 PCFXt6IcYq6rLU7UXS+Md3HYOjZhHfsaT3sUgEZfGwM/wROoemG4r6ddp58bth/lQfDDxDe6tQE NiBB1ZwaX9iuL4heO9xkAHL24CenRQHvY0dkodqmydszNI4097Q== X-Received: by 2002:a17:906:594c:b0:a04:c787:4117 with SMTP id g12-20020a170906594c00b00a04c7874117mr2170497ejr.19.1700832539813; Fri, 24 Nov 2023 05:28:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IHzBMgQVZPXprOuD0bGXn0SMsnT6JufyViFaQTD9r7NmbVjb/AGLLLlndhYnISwybemnDk7BQ== X-Received: by 2002:a17:906:594c:b0:a04:c787:4117 with SMTP id g12-20020a170906594c00b00a04c7874117mr2170490ejr.19.1700832539570; Fri, 24 Nov 2023 05:28:59 -0800 (PST) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id k13-20020a17090632cd00b009ca522853ecsm2054308ejk.58.2023.11.24.05.28.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 05:28:59 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Noble/Unstable][PATCH 6/6] UBUNTU: [Packaging] Remove README.inclusion-list Date: Fri, 24 Nov 2023 14:28:36 +0100 Message-Id: <20231124132836.92441-7-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" It's an old README from 2010 that contains some notes for kernel maintainers. It hasn't been updated since and is not packaged, so drop it. Signed-off-by: Juerg Haefliger Acked-by: Masahiro Yamada --- debian/docs/README.inclusion-list | 51 ------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 debian/docs/README.inclusion-list diff --git a/debian/docs/README.inclusion-list b/debian/docs/README.inclusion-list deleted file mode 100644 index b025393e7c19..000000000000 --- a/debian/docs/README.inclusion-list +++ /dev/null @@ -1,51 +0,0 @@ -This README describes the reason for, and the use of, module -inclusion lists. - -The original Hardy release had the notion of sub-flavours, -e.g., a flavour that was constructed as a subset of an existing flavour. -For example, the virtual flavour was extracted from the server flavour using -a subset of the server flavour modules. However, there were some difficult -mainteneance issues with regard to packaging, make rules, and scripts. This -re-implementation of the sub-flavours philosophy is hopefully simpler, -and retrofitable to all releases. - -A module inclusion list looks at the problem of of constructing a package -from the perspective of what modules do we _want_ in the package, as opposed -to what modules we _don't_ want. As the kernel matures, more and more devices are added -which makes the problem of configuration maintenance a real pain in the ass. -If we took the approach of disabling all of the config options that we don't want, -then the differences between flavours will quickly become quite large, making -it difficult to quickly compare the individual flavour configs. Each time a -new config option is added then we also have to make a decision about disabling in -order to continue to keep the minimal number of modules. - -A module inclusion list is applied on a per-flavour basis. For example, -debian./control.d/${flavour}.inclusion-list. For example, the -config for virtual is very close to server and generic, but the inclusion list -causes the virtual package to be constructed with _only_ the modules described -in the inclusion list. - -The inclusion list format is a simple bash regular expression list of files. For example, - -arch/*/{crypto,kernel,oprofile} -drivers/acpi/* -drivers/ata/ahci.ko - -These 3 regular expression forms are suitable for expansion by bash and as inputs to 'find'. -See debian/scripts/module-inclusion for details. - -There are 2 log files created as a side effect of the application of the module -inclusion list; $(flavour).inclusion-list.log and $(flavour).depmod.log. - -$(flavour).inclusion-list.log : This log is created while the inclusion list -modules are being copied. If any are missing, then those warnings go in this log. -While its not considered a fatal error, you should endevour to correct your inclusion -list such that there are no missing modules. - -$(flavour).depmod.log : The log is created as a result of running depmod on the -resulting set of modules. If there are missing symbols then you'll find that information -here. Again, you should modify your inclusion list such that there are no missing -symbols. - -Tim Gardner -June 2, 2010