[Pkg-uml-devel] Re: Why does linux-uml Conflicts with user-mode-linux?

[Mattia Dongili]

Hello again,

On Thu, May 25, 2006 at 10:44:42AM +0200, Mattia Dongili wrote:
> On Thu, May 25, 2006 2:10 am, Manoj Srivastava said:
[...]
> >> Any chance to change modules install path to not kill the usual
> >> directory structure (`uname -r`/kernel/{arch,crypto,...})?
> >
> >         Err, no path killing is done. We run modules-install in the
> >  kernel source dir as normal, so the dir structure  hackery is not
> >  done by kernel-package.
> 
> then probably something bogus is happening. I'm not home now so I can't
> double check, but I remember the modules.dep lists modules in a different
> structure than the one installed. I'll let you know.

Hummm, 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

Looks suspicous :)
Would you want a whishlist bug + patch (attached here too)?

> >> We are doing: cp -R /usr/lib/uml/modules/* $TARGET/lib/modules in
> >> rootstrap to push all available modules into the root-fs, I did hope
> >> we could catch also linux-uml modules. I didn't even expect the
> >> Conflict outlined above, so this is not currently possible anyway,
> >> but still it would be nice to allow cohexistence.
> >
> >         Well, the conflict is usually for the /usr/bin/linux and
> >  /usr/share/man/man1/linux.1 files. If user-mode-linux would use the
> >  alternatives for that as well, the conflict would go away.
> 
> what about also installing modules under /usr/lib/uml/modules/$UML_VER/
> instead of /usr/lib/uml/modules-$UML_VER/ ?
> This way rootstrap could create root_fs images with all the available UML
> modules versions without too many hacks.

I'm attaching 2 patches here: the first fixes path messing poited above,
the other installs modules in /usr/lib/uml/modules/$(version)/

Thanks
-- 
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
-------------- next part --------------
--- ruleset/misc/pkg_names.mk~clean	2006-05-25 19:36:45.000000000 +0200
+++ ruleset/misc/pkg_names.mk	2006-05-25 19:37:11.000000000 +0200
@@ -85,7 +85,7 @@
 MAN9DIR = $(MANDIR)/man9
 INFODIR = $(TMPTOP)/usr/share/info
 
-UML_DIR        = $(TMPTOP)/usr/lib/uml/modules-$(version)
+UML_DIR        = $(TMPTOP)/usr/lib/uml/modules/$(version)
 
 TMP_MAN        = $(SRCTOP)/debian/tmp_man
 DIRS_TO_CLEAN += $(TMP_MAN)