Message ID | 20171208140122.17831-2-apw@canonical.com |
---|---|
State | New |
Headers | show |
Series | [bionic/master-next,1/1] UBUNTU: [Packaging] disable zfs module checks when zfs is disabled | expand |
On 08/12/17 14:01, Andy Whitcroft wrote: > We currently disable the zfs module changes when we disable zfs > builds as part of cross-compilation. We should disable the zfs > module checks whenever zfs itself is disabled. > > Pull the zfs module disablement support such that it is always > present. > > BugLink: http://bugs.launchpad.net/bugs/1737176 > Signed-off-by: Andy Whitcroft <apw@canonical.com> > --- > debian/rules | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/debian/rules b/debian/rules > index 6c8855f2b3a9..19fe3651f8cf 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -42,7 +42,6 @@ ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) > do_tools=false > disable_d_i=true > do_zfs=false > - do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore) > endif > > # Stages -- support both DEB_STAGE=stage1 and DEB_BUILD_PROFILE=bootstrap > @@ -75,6 +74,10 @@ ifneq ($(do_tools),true) > do_tools_common= > endif > > +ifeq $($(do_zfs),false) > + do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore) > +endif > + > # Either tools package needs the common source preparation > do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) > > Acked-by: Colin Ian King <colin.king@canonical.com>
On Fri, Dec 08, 2017 at 02:01:22PM +0000, Andy Whitcroft wrote: > We currently disable the zfs module changes when we disable zfs > builds as part of cross-compilation. We should disable the zfs > module checks whenever zfs itself is disabled. > > Pull the zfs module disablement support such that it is always > present. > > BugLink: http://bugs.launchpad.net/bugs/1737176 > Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Seth Forshee <seth.forshee@canonical.com> Applied to bionic and unstable.
On Fri, Dec 08, 2017 at 02:01:22PM +0000, Andy Whitcroft wrote: > We currently disable the zfs module changes when we disable zfs > builds as part of cross-compilation. We should disable the zfs > module checks whenever zfs itself is disabled. > > Pull the zfs module disablement support such that it is always > present. > > BugLink: http://bugs.launchpad.net/bugs/1737176 > Signed-off-by: Andy Whitcroft <apw@canonical.com> > --- > debian/rules | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/debian/rules b/debian/rules > index 6c8855f2b3a9..19fe3651f8cf 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -42,7 +42,6 @@ ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) > do_tools=false > disable_d_i=true > do_zfs=false > - do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore) > endif > > # Stages -- support both DEB_STAGE=stage1 and DEB_BUILD_PROFILE=bootstrap > @@ -75,6 +74,10 @@ ifneq ($(do_tools),true) > do_tools_common= > endif > > +ifeq $($(do_zfs),false) I discovered that there's a stray $ here the first time I tried to run fdr clean. I've changed this line to 'ifeq ($(do_zfs),false)' in bionic and unstable, noting that this change will also be needed elsewhere. > + do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore) > +endif > + > # Either tools package needs the common source preparation > do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) > > -- > 2.14.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/debian/rules b/debian/rules index 6c8855f2b3a9..19fe3651f8cf 100755 --- a/debian/rules +++ b/debian/rules @@ -42,7 +42,6 @@ ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) do_tools=false disable_d_i=true do_zfs=false - do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore) endif # Stages -- support both DEB_STAGE=stage1 and DEB_BUILD_PROFILE=bootstrap @@ -75,6 +74,10 @@ ifneq ($(do_tools),true) do_tools_common= endif +ifeq $($(do_zfs),false) + do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore) +endif + # Either tools package needs the common source preparation do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools)))
We currently disable the zfs module changes when we disable zfs builds as part of cross-compilation. We should disable the zfs module checks whenever zfs itself is disabled. Pull the zfs module disablement support such that it is always present. BugLink: http://bugs.launchpad.net/bugs/1737176 Signed-off-by: Andy Whitcroft <apw@canonical.com> --- debian/rules | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)