From patchwork Thu Jul 25 08:57:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Hu X-Patchwork-Id: 1136753 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45vR1B2sDzz9s8m; Thu, 25 Jul 2019 18:57:18 +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 1hqZYp-0002I5-R2; Thu, 25 Jul 2019 08:57:15 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hqZYn-0002Hp-So for fwts-devel@lists.ubuntu.com; Thu, 25 Jul 2019 08:57:13 +0000 Received: from 61-220-137-37.hinet-ip.hinet.net ([61.220.137.37] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hqZYn-00067A-2g; Thu, 25 Jul 2019 08:57:13 +0000 From: Ivan Hu To: fwts-devel@lists.ubuntu.com Subject: [PATCH V2] efi_runtime: remove efi_runtime dkms Date: Thu, 25 Jul 2019 16:57:09 +0800 Message-Id: <1564045029-4809-1-git-send-email-ivan.hu@canonical.com> X-Mailer: git-send-email 2.7.4 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: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" efi_runtime driver provides the runtime UEFI interfaces for fwts to test the UEFI runtime service implementiation and has upstream in Linux 4.9 named efi_test. All supported Ubuntu kernels have efi_test included. As a result, this dkms is no longer required. Signed-off-by: Ivan Hu --- debian/control | 9 +-------- debian/fwts-efi-runtime-dkms.dkms | 6 ------ debian/rules | 18 ++---------------- 3 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 debian/fwts-efi-runtime-dkms.dkms diff --git a/debian/control b/debian/control index dcc7c19..2f88cd1 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Firmware Testing Team Uploaders: Colin King , Alex Hung , Ivan Hu Standards-Version: 3.9.8 -Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, libjson0-dev | libjson-c-dev (>= 0.9), flex, bison, dh-autoreconf, dkms, libglib2.0-dev, pkg-config, libfdt-dev, libbsd-dev +Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, libjson0-dev | libjson-c-dev (>= 0.9), flex, bison, dh-autoreconf, libglib2.0-dev, pkg-config, libfdt-dev, libbsd-dev Package: fwts Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el s390x @@ -53,10 +53,3 @@ Description: Firmware Test Suite frontend interface to execute tests via Firmware Test Suite and is also used as the primary interface within Firmware Test Suite live images. -Package: fwts-efi-runtime-dkms -Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el -Priority: optional -Depends: ${misc:Depends}, dkms -Description: Firmware Test Suite UEFI Runtime Service kernel driver - This package provides the efi_runtime kernel driver in DKMS format, - which is required for accessing UEFI Runtime Services. diff --git a/debian/fwts-efi-runtime-dkms.dkms b/debian/fwts-efi-runtime-dkms.dkms deleted file mode 100644 index 94b3415..0000000 --- a/debian/fwts-efi-runtime-dkms.dkms +++ /dev/null @@ -1,6 +0,0 @@ -PACKAGE_NAME="fwts-efi-runtime-dkms" -PACKAGE_VERSION="#MODULE_VERSION#" -MAKE[0]="KVER=$kernelver make" -BUILT_MODULE_NAME[0]="efi_runtime" -DEST_MODULE_LOCATION[0]="/updates" -AUTOINSTALL="yes" diff --git a/debian/rules b/debian/rules index c24df00..3ca21ad 100755 --- a/debian/rules +++ b/debian/rules @@ -2,27 +2,13 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all +Package: fwts-efi-runtime-dkms DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) -DEBVERS := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 \ - | cut -d- -f1) - -VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') - -DKMS_SRC_DIR := $(CURDIR)/debian/fwts-efi-runtime-dkms/usr/src/fwts-efi-runtime-dkms-$(VERSION) - -override_dh_auto_install: - install -d $(DKMS_SRC_DIR) - cp -a efi_runtime/* $(DKMS_SRC_DIR) - dh_auto_install - -override_dh_dkms: - dh_dkms -V $(VERSION) - override_dh_auto_test: ifneq ($(DEB_BUILD_ARCH),arm64) dh_auto_test $@ endif %: - dh $@ --with autoreconf,dkms + dh $@ --with autoreconf