| Message ID | 1273243911-28016-1-git-send-email-chase.douglas@canonical.com |
|---|---|
| State | Accepted |
| Delegated to: | Andy Whitcroft |
| Headers | show |
On Fri, 2010-05-07 at 10:51 -0400, Chase Douglas wrote: > kernel-wedge copy-modules deals with module dependencies, and it errors > out if it can't find any interdependencies in modules.dep thinking it's > an error. However, sometimes we just want to build a kernel without any > modules. In this case, we need to override the check, which this change > does. > > BugLink: http://bugs.launchpad.net/bugs/577029 > > Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Even though it's slightly mis-leading to always touch no-modules even in the event there are, I don't see this having any adverse affect with the build itself. Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com> > --- > debian/rules.d/5-udebs.mk | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/debian/rules.d/5-udebs.mk b/debian/rules.d/5-udebs.mk > index 4a8a9b4..24fbadf 100644 > --- a/debian/rules.d/5-udebs.mk > +++ b/debian/rules.d/5-udebs.mk > @@ -19,6 +19,9 @@ do-binary-udebs: > /sbin/depmod -b debian/d-i-${arch} $$i; \ > done > > + # kernel-wedge will error if no modules unless this is touched > + touch $(CURDIR)/debian/build/no-modules > + > touch ignore-dups > export SOURCEDIR=$(CURDIR)/debian/d-i-${arch} && \ > cd $(builddir) && \ > -- > 1.7.0.4 > >
Applied to Maverick master. Thanks, Leann
diff --git a/debian/rules.d/5-udebs.mk b/debian/rules.d/5-udebs.mk index 4a8a9b4..24fbadf 100644 --- a/debian/rules.d/5-udebs.mk +++ b/debian/rules.d/5-udebs.mk @@ -19,6 +19,9 @@ do-binary-udebs: /sbin/depmod -b debian/d-i-${arch} $$i; \ done + # kernel-wedge will error if no modules unless this is touched + touch $(CURDIR)/debian/build/no-modules + touch ignore-dups export SOURCEDIR=$(CURDIR)/debian/d-i-${arch} && \ cd $(builddir) && \
kernel-wedge copy-modules deals with module dependencies, and it errors out if it can't find any interdependencies in modules.dep thinking it's an error. However, sometimes we just want to build a kernel without any modules. In this case, we need to override the check, which this change does. BugLink: http://bugs.launchpad.net/bugs/577029 Signed-off-by: Chase Douglas <chase.douglas@canonical.com> --- debian/rules.d/5-udebs.mk | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)