From patchwork Fri Mar 24 08:50:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Hu X-Patchwork-Id: 1760676 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=fwts-devel-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=EJOpotio; 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 4PjbXR0bcdz1yY7 for ; Fri, 24 Mar 2023 19:51:03 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pfd8U-00068N-FR; Fri, 24 Mar 2023 08:50:58 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pfd8S-000688-9J for fwts-devel@lists.ubuntu.com; Fri, 24 Mar 2023 08:50:56 +0000 Received: from canonical.com (unknown [106.104.136.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id B1C5C41DBC for ; Fri, 24 Mar 2023 08:50:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1679647855; bh=7g9HIuizajMlvVJyB5Sshlpb2xNiOjxiJEi/GWr68CY=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=EJOpotioPHPPCHcSxuAdeSAEPhKiifWkKD0zDdMpiN73hmYk3ZM0REiFOjGeugX84 cxLKQ26+M5NOs/snMmCkUhYRNcmL4vS5aJRbSLzqUzVxubYN9UM5gjchpYtOUYuXDq /GGE+pRUfz4qcl8VJ6k85HYTOw3+b5fxD6dqMuRs2XpG6NtLrCMqUijRk687hB4vm0 GhiIUiJnuJtK+D+/4c1S0Uo+alQD5N1BDZO5BYb5KpVz/2iXQnMwIaT798i/RApQDd lMDe6KM/b66iI9wqd14ZhQDmo5UoAWxHT/OGFinRtQjkwL9GY+TauzVsBJRKbXRavg 7YF78gVk1yhSA== From: Ivan Hu To: fwts-devel@lists.ubuntu.com Subject: [PATCH] auto-packer: mkpackage: add build depend dh-dkms for lunar Date: Fri, 24 Mar 2023 16:50:41 +0800 Message-Id: <20230324085041.41307-1-ivan.hu@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" lunar build fail, when dh-dkms no installed, add the dh-dkms to Build-Depends when prepare build for lunar. dh-dkms is only on lunar and kinetic, not on other releases, so not adding directly to debian/control for all releases in case we don't have build error in those releases which no dh-dkms package. Signed-off-by: Ivan Hu --- auto-packager/mkpackage.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/auto-packager/mkpackage.sh b/auto-packager/mkpackage.sh index 1dbe189a..8279b70b 100755 --- a/auto-packager/mkpackage.sh +++ b/auto-packager/mkpackage.sh @@ -123,7 +123,15 @@ mk_package() # sed "s/) $deb_release/$suffix) $rel;/" debian/changelog > debian/changelog.new mv debian/changelog.new debian/changelog - + + # + # control hack + # + if [ "$rel" = "lunar" ]; then + sed 's/dkms,/dkms,\n dh-dkms,/' debian/control > debian/control.new + mv debian/control.new debian/control + fi + echo 'y' | debuild -S rm -rf $FWTS popd >& /dev/null