diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 6921c4abb..728a32d1d 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -4,6 +4,9 @@ - Alejandro Mery: fixed xfree config.in, fixed typo in Build-Tools and Cleanup to skip svn conflict files - updated kopete, sodipodi, neon, subversion and subversion-static + - fixed modutils to install the lsmod into $root/bin (as module-init-tools + do) + - improved svn-static to include the $arch_machine into the binary name *) 2003-09-09 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/package/base/modutils/modutils.conf b/package/base/modutils/modutils.conf index 33ab75095..ae4d63c9e 100644 --- a/package/base/modutils/modutils.conf +++ b/package/base/modutils/modutils.conf @@ -20,27 +20,29 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -inst_mod_conf() { - if false ; then - rm -f $root/etc/modules.conf - depmod -a -F $root/boot/System.map - modprobe -c | grep -v '^Note: ' > $root/etc/modules.conf - else - cp -vf $confdir/modules.conf.data $root/etc/modules.conf +modutils_pm() { + cp -vf $confdir/modules.conf.data $root/etc/modules.conf + mv -fv $root/sbin/lsmod$postfix $root/bin/ + if [ -h $root/bin/lsmod$postfix ] ; then + # correct the symlink destination + rm $root/bin/lsmod$postfix + ln -sfv ../sbin/modprobe$postfix $root/bin/lsmod$postfix fi - add_flist $root/etc/modules.conf } -postmake="inst_mod_conf" +postmake="modutils_pm" confopt="$confopt --sbindir=\$root/sbin --enable-insmod-static" var_remove GCC_WRAPPER_APPEND " " "-s" +postfix="" + if [ -f $root/var/adm/flists/module-init-tools ] ; then var_append patchfiles " " $confdir/use_old_postfix.diff # we need to break the flist-del variable name so Check-PkgFormat # doesn't think that we would add something to the variable ... var_remove flist''del '|' ".*\\.old" postinstall="ln -sfv genksyms.old $root/sbin/genksyms" + postfix=".old" fi export CFLAGS="$CFLAGS -I$root/usr/src/linux/include" diff --git a/package/rene/subversion-static/subversion-static.conf b/package/rene/subversion-static/subversion-static.conf index 3fcdb501f..40719c268 100644 --- a/package/rene/subversion-static/subversion-static.conf +++ b/package/rene/subversion-static/subversion-static.conf @@ -30,7 +30,7 @@ svn_static_pm() cp -v subversion/$prg \ $root/$prefix/bin/$xprg-$arch_machine-static-$ver ln -sfv $xprg-$arch-static-$ver \ - $root/$prefix/bin/$xprg-$arch_machine-static + $root/$prefix/bin/$xprg-$arch-static done }