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