From patchwork Wed Aug 24 11:09:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1669741 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=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=IHHNk6/B; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (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 4MCNdr1s9qz1yhJ for ; Wed, 24 Aug 2022 21:09:20 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oQoFy-0004Au-64; Wed, 24 Aug 2022 11:09:10 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oQoFx-0004Am-2A for kernel-team@lists.ubuntu.com; Wed, 24 Aug 2022 11:09:09 +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 CB8DA3F45E for ; Wed, 24 Aug 2022 11:09:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1661339348; bh=5lYa+tj+0d1sbN9jItwtgmZsP+IWoBnQzVT3rkr4JLo=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=IHHNk6/BFwnP2bpAKJ99avmZ1VaozMgEOi9vSeknbBabHccSOy2K3Y6oBxDu4nJ5l MnttO/DNvAtnOtV8m386KWjN6Fl/HOOemL5A7FApvZE1zx/5fxHWCiO952glM9A414 eKlk+tjWqcToKNjOMEcOTp1Zq1KCjmceR5g/sfjFEhdlOOlZgBPDkE/umCwMSAFZ+S Z5tiY/YbEOQ06aNlTc+5DXbsENz1BBSETxxp6sN2hhlcEIUmVaBotPr5bzBeMmYirB Z4kLT69vTWCMvP7JhdeDYFTom/AW+DGcsylm8P1Jd6VOcKgZlqAdugKmaiDg7VIXva jIQLBjoKe2kew== Received: by mail-ej1-f71.google.com with SMTP id gs35-20020a1709072d2300b00730e14fd76eso5063704ejc.15 for ; Wed, 24 Aug 2022 04:09:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=5lYa+tj+0d1sbN9jItwtgmZsP+IWoBnQzVT3rkr4JLo=; b=i45psOYm18sLCpfpbtOgrSavght04fzTQgDHxS0M+Kb4mSky1l2k1+GtZdgQ0AbOUF imH8MwWYmMzFH2CNTDIyq8voMpskyZr9OZjPNUbWe34vxEfCcKYb36mxPi8WGjjXc1vQ Tx012TvpIEvpLQau5edLezx9dYCjGGRY/wAdP1SY5vKCcI2AnaILxFztl3HsOrI7GiLl KlhsaMGRI4zdtmytan4wMhm22WhDDjFGfID55VLccPctAd1HBtfR9yg3PvRaXGJy9/nW j9Rw78gUJ6XRHPqHVdo/MJpUO7pTswTk0tca1OGBnTM7oeflms50Ds25wMn6So8CM1BR Kn0Q== X-Gm-Message-State: ACgBeo3mx+60QWFnEp+Ze7Iumnu0P/VMSgXIhO2YgtMjOUWaLSiFPR5t peXb4nFw1RQ/Q8bD3iEyFJ7YdjheEridJICJv55AEcffOyFDRw+TD5FMlXwk1l9NlYaZyEOCLlI Bi3/wyK3V8HFTmZhYkVh4CEP6rmhOP3c1p7MW8/v8lA== X-Received: by 2002:a50:fd88:0:b0:446:956d:d83e with SMTP id o8-20020a50fd88000000b00446956dd83emr7232637edt.308.1661339348478; Wed, 24 Aug 2022 04:09:08 -0700 (PDT) X-Google-Smtp-Source: AA6agR7AX/pTawNgwMCZPZIqGe0/vV1dxRUDU+ovUZ2Ftnv4eYR+3IQOJUICMfbqw0CcZXKu8R+CkA== X-Received: by 2002:a50:fd88:0:b0:446:956d:d83e with SMTP id o8-20020a50fd88000000b00446956dd83emr7232629edt.308.1661339348293; Wed, 24 Aug 2022 04:09:08 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id z6-20020a17090665c600b0073d70df6e56sm998120ejn.138.2022.08.24.04.09.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 04:09:07 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][K][PATCH] UBUNTU: [Packaging] getabis: Add modules.builtin to the ABI Date: Wed, 24 Aug 2022 13:09:06 +0200 Message-Id: <20220824110906.266679-1-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 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" Newer buildinfo packages provide a modules.builtin file. Process that file when downloading the ABIs. Signed-off-by: Juerg Haefliger --- debian/scripts/misc/getabis | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/scripts/misc/getabis b/debian/scripts/misc/getabis index 8bb7188956a6..4d79ddf945f4 100755 --- a/debian/scripts/misc/getabis +++ b/debian/scripts/misc/getabis @@ -161,6 +161,9 @@ getall_set() do mv "$base/$comp" "$abidir/$arch/$sub.$comp" done + if [ -e "${base}"/modules.builtin ] ; then + mv "${base}"/modules.builtin "${abidir}/${arch}/${sub}".modules.builtin + fi cat "$base/fwinfo" >>"$fwinfo" if [ -e "${base}"/fwinfo.builtin ] ; then cat "${base}"/fwinfo.builtin >> "${fwinfo}".builtin