[PATCH V2] efi_runtime: remove efi_runtime dkms

[Al Stone]

On 7/25/19 2:57 AM, Ivan Hu wrote:
> 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 <ivan.hu at canonical.com>

I have not done a complete survey, but is this true for all distro
kernels?  Including Debian, for example?  My concern would be that
this might limit some of the adoption of FWTS by UEFI and/or other
organizations where it has been gaining quite a bit of ground.

> ---
>  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 <fwts-devel at lists.ubuntu.com>
>  Uploaders: Colin King <colin.king at ubuntu.com>, Alex Hung <alex.hung at canonical.com>, Ivan Hu <ivan.hu at canonical.com>
>  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
> 


-- 
ciao,
al
-----------------------------------
Al Stone
Software Engineer
Red Hat, Inc.
ahs3 at redhat.com
-----------------------------------