From patchwork Fri Jun 9 03:39:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Hu X-Patchwork-Id: 1792764 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=ZWztffL/; 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 4Qcmzj196Lz20WP for ; Fri, 9 Jun 2023 13:39:45 +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 1q7SyT-0003fY-7v; Fri, 09 Jun 2023 03:39:41 +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 1q7SyR-0003fR-Hy for fwts-devel@lists.ubuntu.com; Fri, 09 Jun 2023 03:39:39 +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 8F2F540265 for ; Fri, 9 Jun 2023 03:39:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1686281978; bh=c/eLG+K7j9WpxMZ2dL38dVqKUGqAX69lf8Lb/J0WqhM=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=ZWztffL/VBhcofuuT6rP6BB5xTzw39tafbKN2h8tHGkOynquAlAhp2Uo4sCcDIXMF lsnfrDw6st8Ifpsf/1OxMTHSvN48oNy1jWHxv/qZgQ1tpFOXl2eF4IazCxK9q93RzH eprB1zpiEAyjXV1+7/QRAmBVPouLfXnIHMy8v+nySsv77sCyPKAROZsNEjLeiIec7z mSMJrWUz3dzF/mx+Eg0x8oBb6h/UOvLZo6lhLbrhgqmSa5Od7ffSLLBW/DDr8O4dzX X8OKvcSgZH+wN/be6nLzmwBkh1KWSw/TquSg2zLgUdt1PXhspHtiVwikdhbtog3JvA C4AxcAGipyebw== From: Ivan Hu To: fwts-devel@lists.ubuntu.com Subject: [PATCH] auto-packager: mkpackage.sh: remove the control hook Date: Fri, 9 Jun 2023 11:39:34 +0800 Message-Id: <20230609033934.55086-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" after the modify debian control, no need to control hook for dh-dkms Signed-off-by: Ivan Hu --- auto-packager/mkpackage.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/auto-packager/mkpackage.sh b/auto-packager/mkpackage.sh index 9d8972e7..30cfa824 100755 --- a/auto-packager/mkpackage.sh +++ b/auto-packager/mkpackage.sh @@ -124,15 +124,6 @@ mk_package() sed "s/) $deb_release/$suffix) $rel;/" debian/changelog > debian/changelog.new mv debian/changelog.new debian/changelog - # - # control hack - # remove dh-dkms dependency for those releases which are on need - # - if [ "$rel" = "bionic" -o "$rel" = "focal" -o "$rel" = "jammy" ]; then - sed '/dh-dkms,/d' debian/control > debian/control.new - mv debian/control.new debian/control - fi - echo 'y' | debuild -S rm -rf $FWTS popd >& /dev/null