| Message ID | 1564045955-6536-1-git-send-email-ivan.hu@canonical.com |
|---|---|
| State | Rejected |
| Headers | show |
| Series | [V3] efi_runtime: remove efi_runtime dkms | expand |
On 25/07/2019 10:12, 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@canonical.com> > --- > debian/control | 9 +-------- > debian/fwts-efi-runtime-dkms.dkms | 6 ------ > debian/rules | 17 +---------------- > 3 files changed, 2 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@lists.ubuntu.com> > Uploaders: Colin King <colin.king@ubuntu.com>, Alex Hung <alex.hung@canonical.com>, Ivan Hu <ivan.hu@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..f43469b 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -4,25 +4,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all > > 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 > Thanks Ivan, Acked-by: Colin Ian King <colin.king@canonical.com>
On Thu, Jul 25, 2019 at 3:15 AM Colin Ian King <colin.king@canonical.com> wrote: > > On 25/07/2019 10:12, 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@canonical.com> > > --- > > debian/control | 9 +-------- > > debian/fwts-efi-runtime-dkms.dkms | 6 ------ > > debian/rules | 17 +---------------- > > 3 files changed, 2 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@lists.ubuntu.com> > > Uploaders: Colin King <colin.king@ubuntu.com>, Alex Hung <alex.hung@canonical.com>, Ivan Hu <ivan.hu@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..f43469b 100755 > > --- a/debian/rules > > +++ b/debian/rules > > @@ -4,25 +4,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all > > > > 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 > > > > Thanks Ivan, > > Acked-by: Colin Ian King <colin.king@canonical.com> This patch is not able to pass ADT test. Let's skip this patch in July's release and revisit it in August. > > -- > fwts-devel mailing list > fwts-devel@lists.ubuntu.com > Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/fwts-devel
On 7/26/19 12:47 AM, Alex Hung wrote: > On Thu, Jul 25, 2019 at 3:15 AM Colin Ian King <colin.king@canonical.com> wrote: >> >> On 25/07/2019 10:12, 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@canonical.com> >>> --- >>> debian/control | 9 +-------- >>> debian/fwts-efi-runtime-dkms.dkms | 6 ------ >>> debian/rules | 17 +---------------- >>> 3 files changed, 2 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@lists.ubuntu.com> >>> Uploaders: Colin King <colin.king@ubuntu.com>, Alex Hung <alex.hung@canonical.com>, Ivan Hu <ivan.hu@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..f43469b 100755 >>> --- a/debian/rules >>> +++ b/debian/rules >>> @@ -4,25 +4,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all >>> >>> 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 >>> >> >> Thanks Ivan, >> >> Acked-by: Colin Ian King <colin.king@canonical.com> > > This patch is not able to pass ADT test. Let's skip this patch in > July's release and revisit it in August. Which version cannot pass ADT test? any fail logs? I just tested Bionic with amd64, it can pass ADT test. Ivan > >> >> -- >> fwts-devel mailing list >> fwts-devel@lists.ubuntu.com >> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/fwts-devel >
Hi Ivan, I run test build and found the ADT test shows no obvious errors, but somehow ADT testing does not return a successful error code as it would without the patch. As it is already a late release, it would be a good idea to spend more time on this patch as Colin thought it should be a dependency issue. On Fri, Jul 26, 2019 at 2:54 AM ivanhu <ivan.hu@canonical.com> wrote: > > > > On 7/26/19 12:47 AM, Alex Hung wrote: > > On Thu, Jul 25, 2019 at 3:15 AM Colin Ian King <colin.king@canonical.com> wrote: > >> > >> On 25/07/2019 10:12, 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@canonical.com> > >>> --- > >>> debian/control | 9 +-------- > >>> debian/fwts-efi-runtime-dkms.dkms | 6 ------ > >>> debian/rules | 17 +---------------- > >>> 3 files changed, 2 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@lists.ubuntu.com> > >>> Uploaders: Colin King <colin.king@ubuntu.com>, Alex Hung <alex.hung@canonical.com>, Ivan Hu <ivan.hu@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..f43469b 100755 > >>> --- a/debian/rules > >>> +++ b/debian/rules > >>> @@ -4,25 +4,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all > >>> > >>> 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 > >>> > >> > >> Thanks Ivan, > >> > >> Acked-by: Colin Ian King <colin.king@canonical.com> > > > > This patch is not able to pass ADT test. Let's skip this patch in > > July's release and revisit it in August. > > Which version cannot pass ADT test? any fail logs? > I just tested Bionic with amd64, it can pass ADT test. > > Ivan > > > > >> > >> -- > >> fwts-devel mailing list > >> fwts-devel@lists.ubuntu.com > >> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/fwts-devel > > > > -- > fwts-devel mailing list > fwts-devel@lists.ubuntu.com > Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/fwts-devel
On 26/07/2019 18:54, Alex Hung wrote: > Hi Ivan, > > I run test build and found the ADT test shows no obvious errors, but > somehow ADT testing does not return a successful error code as it > would without the patch. As it is already a late release, it would be > a good idea to spend more time on this patch as Colin thought it > should be a dependency issue. Basically, I ran out of time to debug this any further and deemed it better to punt this change into the next release rather than delay the current release. I'm still not sure why we were seeing an ADT test failure, I guess the final rush and me running out of time made it harder to figure out what was going wrong for us. Colin > > On Fri, Jul 26, 2019 at 2:54 AM ivanhu <ivan.hu@canonical.com> wrote: >> >> >> >> On 7/26/19 12:47 AM, Alex Hung wrote: >>> On Thu, Jul 25, 2019 at 3:15 AM Colin Ian King <colin.king@canonical.com> wrote: >>>> >>>> On 25/07/2019 10:12, 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@canonical.com> >>>>> --- >>>>> debian/control | 9 +-------- >>>>> debian/fwts-efi-runtime-dkms.dkms | 6 ------ >>>>> debian/rules | 17 +---------------- >>>>> 3 files changed, 2 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@lists.ubuntu.com> >>>>> Uploaders: Colin King <colin.king@ubuntu.com>, Alex Hung <alex.hung@canonical.com>, Ivan Hu <ivan.hu@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..f43469b 100755 >>>>> --- a/debian/rules >>>>> +++ b/debian/rules >>>>> @@ -4,25 +4,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all >>>>> >>>>> 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 >>>>> >>>> >>>> Thanks Ivan, >>>> >>>> Acked-by: Colin Ian King <colin.king@canonical.com> >>> >>> This patch is not able to pass ADT test. Let's skip this patch in >>> July's release and revisit it in August. >> >> Which version cannot pass ADT test? any fail logs? >> I just tested Bionic with amd64, it can pass ADT test. >> >> Ivan >> >>> >>>> >>>> -- >>>> fwts-devel mailing list >>>> fwts-devel@lists.ubuntu.com >>>> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/fwts-devel >>> >> >> -- >> fwts-devel mailing list >> fwts-devel@lists.ubuntu.com >> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/fwts-devel > > >
It fails to pass ADT test on eoan. Let's revisit it in the future. Ivan On 7/25/19 5:12 PM, 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@canonical.com> > --- > debian/control | 9 +-------- > debian/fwts-efi-runtime-dkms.dkms | 6 ------ > debian/rules | 17 +---------------- > 3 files changed, 2 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@lists.ubuntu.com> > Uploaders: Colin King <colin.king@ubuntu.com>, Alex Hung <alex.hung@canonical.com>, Ivan Hu <ivan.hu@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..f43469b 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -4,25 +4,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all > > 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 >
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@lists.ubuntu.com> Uploaders: Colin King <colin.king@ubuntu.com>, Alex Hung <alex.hung@canonical.com>, Ivan Hu <ivan.hu@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..f43469b 100755 --- a/debian/rules +++ b/debian/rules @@ -4,25 +4,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all 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
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@canonical.com> --- debian/control | 9 +-------- debian/fwts-efi-runtime-dkms.dkms | 6 ------ debian/rules | 17 +---------------- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 debian/fwts-efi-runtime-dkms.dkms