From patchwork Wed Sep 18 11:41:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1986770 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 4X7xZ21ksVz1y1m for ; Wed, 18 Sep 2024 21:41:30 +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 1sqt3h-0005oB-Il; Wed, 18 Sep 2024 11:41:21 +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 1sqt3f-0005lw-SY for kernel-team@lists.ubuntu.com; Wed, 18 Sep 2024 11:41:19 +0000 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.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 B6B5C3F129 for ; Wed, 18 Sep 2024 11:41:19 +0000 (UTC) Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-42cb0b0514bso53214945e9.1 for ; Wed, 18 Sep 2024 04:41:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726659679; x=1727264479; 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=bDfgRuPHzDTXl4C7OWGlueYEkCEnNDB/rJ7ThGrcpLc=; b=viEZRTZmv0gSu9hhnWvYBJna/wafOecZMR8WGUQlqj8kk3p5V2cj/PnNWIVnTF0Fyq QOnb8BYotbsRqltXPnMjyzgMNkQQTe1Iw/3VcijH4AWb18NSicggsFzv9Xp3g3QniwgM BhEcqumzd03BhL2POUnARansIf66R21EB8VKT3dhiVFVJQR1zmRg9LRCFzP/imSGknUc UrPDhMnylOGLCxdVbtaMrxQfZdp9TPPNyaL0ozMCACPsb7kXgvxA/Mf6ZWPtRKpSgB54 ic5MP9fl5R/NDQH9b24u4oenoOPSxuAlMfsTrGGrEXdN5/Jicd9NHPp+h4/P0IcWPIAS TWsw== X-Gm-Message-State: AOJu0Yz5EsmLZz986GXlewuV6lbeBkQ1dPLVXC3Myg2o7Qz8zCyPLpw6 5TbxJVnmRhWvVhxwOl44sySK/RmGeUqztj8pyWE7+KbQdUzDw3592FkTyPRKsy5mdAQYm4ZFwHI 9BsP9TvDAoTPq1d2nKseL3JWmZ0AxNZw80Y/HeFZjf5TpttcMOcMBccUJL4IRauqmFK7MaHWS/e TQOfNlWNRgSA== X-Received: by 2002:a05:600c:4691:b0:42c:b1e1:a45b with SMTP id 5b1f17b1804b1-42cdb547f39mr156591375e9.19.1726659679315; Wed, 18 Sep 2024 04:41:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGF2riFk8B2Vxnjvz9FJ0X1GGgCy7OaMjsliABe3wmB5iPcc1G7cpyNRQBe3FwmrgjD2xXkiA== X-Received: by 2002:a05:600c:4691:b0:42c:b1e1:a45b with SMTP id 5b1f17b1804b1-42cdb547f39mr156591195e9.19.1726659678705; Wed, 18 Sep 2024 04:41:18 -0700 (PDT) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e70548ad2sm14696925e9.39.2024.09.18.04.41.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 04:41:18 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [O:lowlatency][PATCH 1/3] UBUNTU: [Packaging] lowlatency: Don't build tools-common and tools-host packages Date: Wed, 18 Sep 2024 13:41:13 +0200 Message-ID: <20240918114115.954562-2-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240918114115.954562-1-juerg.haefliger@canonical.com> References: <20240918114115.954562-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" BugLink: https://bugs.launchpad.net/bugs/2048183 Signed-off-by: Juerg Haefliger --- debian.lowlatency/control.stub.in | 34 ------------------------------- 1 file changed, 34 deletions(-) diff --git a/debian.lowlatency/control.stub.in b/debian.lowlatency/control.stub.in index 799f430a0f75..2dab96edcbbb 100644 --- a/debian.lowlatency/control.stub.in +++ b/debian.lowlatency/control.stub.in @@ -71,19 +71,6 @@ Description: Header files related to Linux kernel version PKGVER that want the latest kernel headers. Please read /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details -Package: SRCPKGNAME-tools-common -Build-Profiles: -Architecture: all -Multi-Arch: foreign -Section: kernel -Priority: optional -Provides: bpftool -Depends: ${misc:Depends}, lsb-release -Description: Linux kernel version specific tools for version PKGVER - This package provides the architecture independent parts for kernel - version locked tools (such as perf and x86_energy_perf_policy) for - version PKGVER. - Package: SRCPKGNAME-tools-PKGVER-ABINUM Build-Profiles: Architecture: amd64 arm64 @@ -97,17 +84,6 @@ Description: Linux kernel version specific tools for version PKGVER-ABINUM =HUMAN=. You probably want to install linux-tools-PKGVER-ABINUM-. -Package: SRCPKGNAME-cloud-tools-common -Build-Profiles: -Architecture: all -Multi-Arch: foreign -Section: kernel -Priority: optional -Depends: ${misc:Depends} -Description: Linux kernel version specific cloud tools for version PKGVER - This package provides the architecture independent parts for kernel - version locked tools for cloud tools for version PKGVER. - Package: SRCPKGNAME-cloud-tools-PKGVER-ABINUM Build-Profiles: Architecture: amd64 arm64 @@ -120,13 +96,3 @@ Description: Linux kernel version specific cloud tools for version PKGVER-ABINUM =HUMAN=. You probably want to install linux-cloud-tools-PKGVER-ABINUM-. -Package: SRCPKGNAME-tools-host -Build-Profiles: -Architecture: all -Multi-Arch: foreign -Section: kernel -Priority: optional -Depends: ${misc:Depends}, python3 -Description: Linux kernel VM host tools - This package provides kernel tools useful for VM hosts. - From patchwork Wed Sep 18 11:41:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1986771 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 4X7xZ55B7Xz1y1m for ; Wed, 18 Sep 2024 21:41:33 +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 1sqt3l-0005qA-Sy; Wed, 18 Sep 2024 11:41:25 +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 1sqt3k-0005pM-6T for kernel-team@lists.ubuntu.com; Wed, 18 Sep 2024 11:41:24 +0000 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.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-0.canonical.com (Postfix) with ESMTPS id 4FED93F118 for ; Wed, 18 Sep 2024 11:41:21 +0000 (UTC) Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-374c54e188dso357585f8f.1 for ; Wed, 18 Sep 2024 04:41:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726659681; x=1727264481; 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=2qVqI3XcuBcIh1M6DwUQgbQG62phJ4nk8OmhYJL8KKE=; b=Stjzpz+iHMoW/a61ia6oyQVbzsxl5BBtMFNFaEabjW77zDWFuaOAo36uySAylc0Epo MsHOBft/14ihT/KPGviJcbwQAziwKBo7ZmT4mDPqOMfG+AwEeV9JJ3pzTk7SjvSGRQ9I gEMnnUEflrmqRW56JkG+0bbS247O1Vt1P0PZCa7C0WFTlmS+64uyOxJARiVWZeE6/UEO vrJFQBPxbu6rORVPq9lHdbCKoGNPHTHzOGXQglZODNGqDEtII2hy9/FKgOUUcbAPceOn 9dW4xF8pZklfhukeliZpBmLRK5TzFgP5D6zT9aPPRFdDPqgthj+yGi6KPi8L5vh/+kIj alrg== X-Gm-Message-State: AOJu0YxhJ73AP8Jz+Ezi9m76i7ArMSL2oUQ733Wgf2JyRu23Yqx8pMKu HJQtVPkRmD+pIDco/q9T8/p26W9VO7IvmYkOEDZJ/b2ufHhKsaEReA595RR6wxBMpmRJw4VIbOt gnVaIKSPWuLaFffy062RaehvSAJa4DKVAkbE/lK8EuRy5USEEHTzglFvInCOAfMp1k94n/QUngx /Oy2uO9h2WCA== X-Received: by 2002:adf:e5ca:0:b0:374:bf6b:1021 with SMTP id ffacd0b85a97d-378a8aae173mr17725269f8f.27.1726659680780; Wed, 18 Sep 2024 04:41:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGHOP60NrFnyNRqRLI2/ddfv2UEOwdBBpOps6SkDkPoAvAOX72cYTzsSNi6ACS5XgRG1J14OA== X-Received: by 2002:adf:e5ca:0:b0:374:bf6b:1021 with SMTP id ffacd0b85a97d-378a8aae173mr17725247f8f.27.1726659680331; Wed, 18 Sep 2024 04:41:20 -0700 (PDT) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-378e78054absm12132872f8f.106.2024.09.18.04.41.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 04:41:19 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [O:lowlatency][PATCH 2/3] UBUNTU: [Packaging] lowlatency: Remove unused/invalid do_* build variables Date: Wed, 18 Sep 2024 13:41:14 +0200 Message-ID: <20240918114115.954562-3-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240918114115.954562-1-juerg.haefliger@canonical.com> References: <20240918114115.954562-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" BugLink: https://bugs.launchpad.net/bugs/2077306 Signed-off-by: Juerg Haefliger --- debian.lowlatency/rules.d/amd64.mk | 3 --- debian.lowlatency/rules.d/i386.mk | 3 --- debian.lowlatency/rules.d/riscv64.mk | 3 --- 3 files changed, 9 deletions(-) diff --git a/debian.lowlatency/rules.d/amd64.mk b/debian.lowlatency/rules.d/amd64.mk index 13ff67f50655..4aba74d9725f 100644 --- a/debian.lowlatency/rules.d/amd64.mk +++ b/debian.lowlatency/rules.d/amd64.mk @@ -14,10 +14,7 @@ do_tools_perf_jvmti = true do_tools_bpftool = true do_tools_x86 = true do_tools_hyperv = true -do_tools_host = true do_extras_package = true -do_tools_common = true do_tools_acpidbg = true -do_odm_drivers = true do_lib_rust = true flavours = lowlatency diff --git a/debian.lowlatency/rules.d/i386.mk b/debian.lowlatency/rules.d/i386.mk index a9327adb7052..45e7e48aeaa1 100644 --- a/debian.lowlatency/rules.d/i386.mk +++ b/debian.lowlatency/rules.d/i386.mk @@ -9,9 +9,6 @@ vdso = vdso_install no_dumpfile = true do_flavour_image_package = false do_tools = false -do_tools_common = false do_extras_package = false -do_source_package = false -do_doc_package = false do_flavour_header_package = false do_common_headers_indep = false diff --git a/debian.lowlatency/rules.d/riscv64.mk b/debian.lowlatency/rules.d/riscv64.mk index 2fa468ae8c1e..0acda1b1afd8 100644 --- a/debian.lowlatency/rules.d/riscv64.mk +++ b/debian.lowlatency/rules.d/riscv64.mk @@ -11,9 +11,6 @@ no_dumpfile = true do_flavour_image_package = false do_tools = false -do_tools_common = false do_extras_package = false -do_source_package = false -do_doc_package = false do_flavour_header_package = false do_common_headers_indep = false From patchwork Wed Sep 18 11:41:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1986772 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 4X7xZ61GXsz1y2l for ; Wed, 18 Sep 2024 21:41:34 +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 1sqt3n-0005rb-3n; Wed, 18 Sep 2024 11:41:27 +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 1sqt3k-0005pc-Nw for kernel-team@lists.ubuntu.com; Wed, 18 Sep 2024 11:41:24 +0000 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.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-0.canonical.com (Postfix) with ESMTPS id 114A03F2B9 for ; Wed, 18 Sep 2024 11:41:24 +0000 (UTC) Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-42e611963c2so21706155e9.1 for ; Wed, 18 Sep 2024 04:41:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726659682; x=1727264482; 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=g/tRJZ+mzZQGnnn7j4x+8IQttOqymQvR8mQPrii8SzI=; b=Cx+CraHG5AG2AXucTLEQvL6828s9OP8UnfDpo5yUjyI5kBQUckPoQDAUk1/3U2S9nm zSgrz/MGISegDtYKq9geQGReiOUGygpvC1rUzH++RtnVXCnumcgm74ZnBajgmL9dyQna JcH64EQN3+vluXUHI5qY8/g1xQtkO0oWatAlGGzODASDWjYio+pK72N68d94mh6yto/E r5547Gag0/xPLJTubKevCd+lB0FRwh6pbfvTfIaaYJQ7GUatfaFTosNvmtXidnrnD4yg RuUn4g3+PfxLE2jLpdIEFp5xuWUH2zfZrQl1Lqpm6PZbN6iAFVLSmLGkE/8zE4uwrhJE 0sAA== X-Gm-Message-State: AOJu0YwJuU++S8FttmVw60Qj0y5wIAzzSwZMTMU625fSW5AyByTptfel ViAXWVH1K/qp6Urm56Xf4MxUXlJh3spdVThwbVyIDYKYVxZ/ZMIxCi5BYMTVIHxxJL7Uhcef174 Q3Pg+A//TDoHtOIAA5yGDWyIt+LIwCyar0wZbpzBY96CR3k+0X+XHy/Aw+meXF1tsTD2cTk110O MmQvPaC0/CTw== X-Received: by 2002:a05:600c:1e05:b0:42c:c073:412b with SMTP id 5b1f17b1804b1-42cdb58df99mr167794675e9.30.1726659682366; Wed, 18 Sep 2024 04:41:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGW67Dr/W2pKYJ3A4MU/QADW3RPo8hE38yXYYAiwunFyChI92ZF5H5Yp23J0sYhXrs/2jbbFQ== X-Received: by 2002:a05:600c:1e05:b0:42c:c073:412b with SMTP id 5b1f17b1804b1-42cdb58df99mr167794405e9.30.1726659681738; Wed, 18 Sep 2024 04:41:21 -0700 (PDT) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-378e780007dsm12136679f8f.82.2024.09.18.04.41.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 04:41:21 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [O:lowlatency][PATCH 3/3] UBUNTU: [Packaging] lowlatency: Remove backport packaging logic Date: Wed, 18 Sep 2024 13:41:15 +0200 Message-ID: <20240918114115.954562-4-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240918114115.954562-1-juerg.haefliger@canonical.com> References: <20240918114115.954562-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" BugLink: https://bugs.launchpad.net/bugs/2080970 This is not a backported kernel so remove the backport packaging logic which - when present - might produce unexpected packaging results. Signed-off-by: Juerg Haefliger --- debian.lowlatency/etc/local.conf | 1 - debian.lowlatency/rules.d/hooks.mk | 6 -- debian.lowlatency/scripts/helpers/copy-files | 62 ------------------- .../scripts/helpers/local-mangle | 24 ------- 4 files changed, 93 deletions(-) delete mode 100644 debian.lowlatency/etc/local.conf delete mode 100644 debian.lowlatency/rules.d/hooks.mk delete mode 100755 debian.lowlatency/scripts/helpers/copy-files delete mode 100755 debian.lowlatency/scripts/helpers/local-mangle diff --git a/debian.lowlatency/etc/local.conf b/debian.lowlatency/etc/local.conf deleted file mode 100644 index 453a234e64db..000000000000 --- a/debian.lowlatency/etc/local.conf +++ /dev/null @@ -1 +0,0 @@ -FOREIGN_ARCHES="armhf ppc64el s390x" diff --git a/debian.lowlatency/rules.d/hooks.mk b/debian.lowlatency/rules.d/hooks.mk deleted file mode 100644 index 3d2580d7a4c8..000000000000 --- a/debian.lowlatency/rules.d/hooks.mk +++ /dev/null @@ -1,6 +0,0 @@ -do_enforce_all = true -do_libc_dev_package = false -do_doc_package = false -do_tools_common = false -do_tools_host = false -do_source_package = false diff --git a/debian.lowlatency/scripts/helpers/copy-files b/debian.lowlatency/scripts/helpers/copy-files deleted file mode 100755 index c80862fbf605..000000000000 --- a/debian.lowlatency/scripts/helpers/copy-files +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -eu - -if [ -f debian/debian.env ]; then - # shellcheck disable=SC1091 - . debian/debian.env -fi - -if [ ! -d "${DEBIAN}" ]; then - echo You must run this script from the top directory of this repository. - exit 1 -fi - -CONF="${DEBIAN}"/etc/update.conf -if [ -f "${CONF}" ]; then - # shellcheck disable=SC1090 - . "${CONF}" -fi - -FOREIGN_ARCHES="" -LOCAL_CONF="${DEBIAN}/etc/local.conf" -if [ -f "${LOCAL_CONF}" ]; then - # shellcheck disable=SC1090 - . "${LOCAL_CONF}" -fi - -SKIP_RULES_D=${SKIP_RULES_D:-} - -# -# Update configs from master -# -rsync -avc --exclude 'annotations' --exclude 'config.flavour.lowlatency' --exclude 'config.flavour.lowlatency-64k' --delete "${DEBIAN_MASTER}/config/" "${DEBIAN}/config" - -# -# Update package and DTB settings from master. -# -if [ -z "${SKIP_RULES_D}" ] ; then - rsync -avc "${DEBIAN_MASTER}/rules.d/"*.mk "${DEBIAN}/rules.d/" -fi - -# Remove the .mk files from the arch's that are not supported -for i in ${FOREIGN_ARCHES} -do - rm -f "${DEBIAN}/rules.d/${i}.mk" - git rm -f --ignore-unmatch "${DEBIAN}/rules.d/${i}.mk" || true -done - -# -# Update modprobe.d from master -# -# Some releases (trusty) don't have this directory, and rsync would fail -# without this check. -if [ -d "${DEBIAN}/modprobe.d/" ]; then - rsync -avc --delete "${DEBIAN_MASTER}/modprobe.d/" "${DEBIAN}/modprobe.d" -fi - -cp -p "${DEBIAN_MASTER}/control.d/"*.inclusion-list "${DEBIAN}/control.d" - -cp -p "${DEBIAN_MASTER}/reconstruct" "${DEBIAN}/reconstruct" - -if [ -x "${DEBIAN}/scripts/helpers/local-mangle" ]; then - "./${DEBIAN}/scripts/helpers/local-mangle" -fi diff --git a/debian.lowlatency/scripts/helpers/local-mangle b/debian.lowlatency/scripts/helpers/local-mangle deleted file mode 100755 index 4fbed2506102..000000000000 --- a/debian.lowlatency/scripts/helpers/local-mangle +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -eu - -. debian/debian.env - -# We only build the lowlatency/lowlatency-64k flavours -sed -i '/^flavours.*$/d' ${DEBIAN}/rules.d/amd64.mk -sed -i '/^flavours.*$/d' ${DEBIAN}/rules.d/arm64.mk -echo -e "flavours\t= lowlatency" >> ${DEBIAN}/rules.d/amd64.mk -echo -e "flavours\t= lowlatency lowlatency-64k" >> ${DEBIAN}/rules.d/arm64.mk - -# We only care about lowlatency/lowlatency-64k abis -sed -i /getall/d ${DEBIAN}/etc/getabis -echo "getall amd64 lowlatency" >> ${DEBIAN}/etc/getabis -echo "getall arm64 lowlatency lowlatency-64k" >> ${DEBIAN}/etc/getabis - -# Override options in rules.d/hooks.mk (normally master does not have this -# file but it got added for generic annotations enforcement. -cat <>${DEBIAN}/rules.d/hooks.mk -do_libc_dev_package = false -do_doc_package = false -do_tools_common = false -do_tools_host = false -do_source_package = false -EOD