[Pkg-uml-devel] Bug#369154: kernel-package: Do not flattern the linux-uml modules directory structure

[Mattia Dongili]

Package: kernel-package
Version: 10.047
Severity: minor
Tags: patch

Hello,
in ruleset/targets/image.mk:208                                           
                                        
        if [ -d $(INSTALL_MOD_PATH)/lib/modules ] ; then               \
          find $(INSTALL_MOD_PATH)/lib/modules/ -type f -print0 |      \
           xargs -0ri mv {} $(UML_DIR)/ ;                               \
        fi

This flatterns the directory structure putting all files in the same
directory that otherwise would look like:

/usr/lib/uml/modules/2.6.16-um3/
|-- build -> /usr/src/linux-source-2.6.16
|-- kernel
|   |-- arch
|   |   `-- um
|   |       `-- drivers
|   |           `-- hostaudio.ko
|   |-- drivers
|   |   |-- block
|   |   |   |-- loop.ko
...
|   |-- lib
|   |   `-- crc32.ko
|   `-- sound
|       `-- soundcore.ko
|-- modules.alias
[...]

The attached patch fixes it.
Thanks,
Mattia

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (990, 'testing'), (300, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17-rc4-mm2-1
Locale: LANG=en_GB, LC_CTYPE=en_GB (charmap=ISO-8859-1)

Versions of packages kernel-package depends on:
ii  dpkg                         1.13.19     package maintenance system for Deb
ii  dpkg-dev                     1.13.19     package building tools for Debian
ii  file                         4.17-1      Determines file type using "magic"
ii  gcc [c-compiler]             4:4.0.2-2   The GNU C compiler
ii  gcc-2.95 [c-compiler]        1:2.95.4-22 The GNU C compiler
ii  gcc-3.3 [c-compiler]         1:3.3.6-13  The GNU C compiler
ii  gcc-4.0 [c-compiler]         4.0.3-3     The GNU C compiler
ii  gcc-4.1 [c-compiler]         4.1.0-4     The GNU C compiler
ii  gettext                      0.14.5-4    GNU Internationalization utilities
ii  make                         3.81-2      The GNU version of the "make" util
ii  perl                         5.8.8-4     Larry Wall's Practical Extraction 
ii  po-debconf                   1.0.1       manage translated Debconf template
ii  tcc [c-compiler]             0.9.23-2    The smallest ANSI C compiler

Versions of packages kernel-package recommends:
ii  bzip2                         1.0.3-2    high-quality block-sorting file co
ii  libc6-dev [libc-dev]          2.3.6-7    GNU C Library: Development Librari

-- no debconf information
-- 
mattia
:wq!
-------------- next part --------------
--- ruleset/targets/image.mk~clean	2006-05-25 19:32:51.000000000 +0200
+++ ruleset/targets/image.mk	2006-05-25 20:51:25.000000000 +0200
@@ -206,8 +206,7 @@
   endif
 else
 	if [ -d $(INSTALL_MOD_PATH)/lib/modules ] ; then               \
-          find $(INSTALL_MOD_PATH)/lib/modules/ -type f -print0 |      \
-	   xargs -0ri mv {} $(UML_DIR)/ ;                               \
+	   mv $(INSTALL_MOD_PATH)/lib/modules/$(version)/* $(UML_DIR)/;            \
         fi
 	rm -rf $(INSTALL_MOD_PATH)/lib
 endif