diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-09-13 22:26:20 -0700 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-09-14 08:56:35 -0700 |
| commit | cdbda0f058f801c34a3151958e90f5b1e842bf1d (patch) | |
| tree | 8c2c6bdec068a57eef19749bcab0ef4e90dfc2c7 | |
| parent | 458da7e5c4c6c0539d43fd837b53203568a07dae (diff) | |
UBUNTU: execute module-inclusion within a subshell
BugLink: http://bugs.launchpad.net/bugs/621175
When uploading the kernel with the orig.tar.gz included, executable
modes are not represented in the diff, eg:
dpkg-source: warning: executable mode 0755 of 'debian/scripts/module-inclusion' will not be represented in diff
As a result, when debian/scripts/module-inclusion is called when
building the -virtual kernel .deb, we see the following error:
/bin/bash: line 1: debian/scripts/module-inclusion: Permission denied
This results in a larger -virtual kernel .deb size because the
module-inclusion script is not run which prevents the removal of modules
not in the inclusion list. The following patch calls
debian/scripts/module-inclusion from within a subshell in order for it
to execute.
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
| -rw-r--r-- | debian/rules.d/2-binary-arch.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index da93e4db318..1d264969e99 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -82,7 +82,7 @@ endif # Remove all modules not in the inclusion list. # if [ -f $(DEBIAN)/control.d/$(target_flavour).inclusion-list ] ; then \ - $(DROOT)/scripts/module-inclusion $(pkgdir)/lib/modules/$(abi_release)-$*/kernel \ + $(SHELL) $(DROOT)/scripts/module-inclusion $(pkgdir)/lib/modules/$(abi_release)-$*/kernel \ $(DEBIAN)/control.d/$(target_flavour).inclusion-list 2>&1 | \ tee $(target_flavour).inclusion-list.log; \ /sbin/depmod -b $(pkgdir) -ea -F $(pkgdir)/boot/System.map-$(abi_release)-$* \ |