linux: run depmod in 'scripts/image' instead in every package

Signed-off-by: Stephan Raue <stephan@openelec.tv>
2025-07-24 11:16:51 +00:00 · 2011-11-06 17:43:57 +01:00 · 2011-11-06 17:43:57 +01:00 · 0f4562c2e5
commit 0f4562c2e5
parent 5484099afb
14 changed files with 13 additions and 49 deletions
--- a/packages/linux-drivers/AF9035/install
+++ b/packages/linux-drivers/AF9035/install
@ -31,8 +31,3 @@ mkdir -p $INSTALL/lib/modules/$VER/AF9035

 mkdir -p $INSTALL/lib/firmware
  cp $PKG_DIR/firmware/*.fw $INSTALL/lib/firmware
-
-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done
--- a/packages/linux-drivers/AF9035/meta
+++ b/packages/linux-drivers/AF9035/meta
@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.abclinuxu.cz/hardware/pridavne-karty/televizni-karty/dvb-t/usb/aver-tv-volar-hd-a835"
 PKG_URL="http://xgazza.altervista.org/Linux/DVB/Drivers/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain linux busybox-hosttools"
+PKG_BUILD_DEPENDS="toolchain linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
 PKG_SHORTDESC="AF9035 driver: Afa Technologies Inc. AF9035A USB Device"
--- a/packages/linux-drivers/a867_drv/install
+++ b/packages/linux-drivers/a867_drv/install
@ -26,8 +26,3 @@ VER=`ls $BUILD/linux*/modules/lib/modules`

 mkdir -p $INSTALL/lib/modules/$VER/a867
 cp $PKG_BUILD/a867.ko $INSTALL/lib/modules/$VER/a867/
-
-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done
--- a/packages/linux-drivers/a867_drv/meta
+++ b/packages/linux-drivers/a867_drv/meta
@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.avermedia.com/Product/ProductDetail.aspx?Id=516&tab=APDriver"
 PKG_URL="http://www.avermedia.com/avertv/Upload/Download/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain linux busybox-hosttools"
+PKG_BUILD_DEPENDS="toolchain linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
 PKG_SHORTDESC="AVerTV Volar HD Nano A867R driver"
--- a/packages/linux-drivers/asix-ax887xx/install
+++ b/packages/linux-drivers/asix-ax887xx/install
@ -26,8 +26,3 @@ VER=`ls $BUILD/linux*/modules/lib/modules`

 mkdir -p $INSTALL/lib/modules/$VER/asix-ax887xx
  cp $PKG_BUILD/asix.ko $INSTALL/lib/modules/$VER/asix-ax887xx
-
-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done
--- a/packages/linux-drivers/asix-ax887xx/meta
+++ b/packages/linux-drivers/asix-ax887xx/meta
@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.asix.com.tw"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain linux busybox-hosttools"
+PKG_BUILD_DEPENDS="toolchain linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
 PKG_SHORTDESC="asix-ax887xx: ASIX AX88772B/772A/760/772/178 Linux USB LANDriver"
--- a/packages/linux-drivers/bcm_sta/install
+++ b/packages/linux-drivers/bcm_sta/install
@ -27,8 +27,3 @@ VER=`ls $BUILD/linux*/modules/lib/modules`
 mkdir -p $INSTALL/lib/modules/$VER/bcm_sta
 [ "$TARGET_ARCH" = "i386" ] && cp $PKG_BUILD/x86-32/wl.ko $INSTALL/lib/modules/$VER/bcm_sta
 [ "$TARGET_ARCH" = "x86_64" ] && cp $PKG_BUILD/x86-64/wl.ko $INSTALL/lib/modules/$VER/bcm_sta
-
-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done
--- a/packages/linux-drivers/bcm_sta/meta
+++ b/packages/linux-drivers/bcm_sta/meta
@ -26,7 +26,7 @@ PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com/"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain linux  busybox-hosttools"
+PKG_BUILD_DEPENDS="toolchain linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
 PKG_SHORTDESC="bcm_sta: Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-, BCM4322-, BCM43224-, and BCM43225-based WLAN driver"
--- a/packages/linux/install
+++ b/packages/linux/install
@ -30,11 +30,6 @@ mkdir -p $INSTALL/lib/modules/$VER
  cp -r $PKG_BUILD/modules/* $INSTALL
  rm -f $INSTALL/lib/modules/$VER/modules.*

-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done
-
 # copy kernel firmwares (if present and requested)
  mkdir -p $INSTALL/lib/firmware
  [ -d $PKG_BUILD/modules/lib/firmware ] && \
--- a/packages/multimedia/crystalhd/install
+++ b/packages/multimedia/crystalhd/install
@ -35,8 +35,3 @@ mkdir -p $INSTALL/lib/udev/rules.d

 mkdir -p $INSTALL/lib/modules/$VER/crystalhd
  cp $PKG_BUILD/driver/linux/crystalhd.ko $INSTALL/lib/modules/$VER/crystalhd
-
-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done
--- a/packages/multimedia/crystalhd/meta
+++ b/packages/multimedia/crystalhd/meta
@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/crystalhd-for-osx/"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="linux"
-PKG_BUILD_DEPENDS="toolchain busybox-hosttools linux"
+PKG_BUILD_DEPENDS="toolchain linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="crystalhd: OSX and Linux driver and library support for the Broadcom Crystal HD Video Accelerator."
--- a/packages/x11/driver/xf86-video-fglrx/install
+++ b/packages/x11/driver/xf86-video-fglrx/install
@ -22,8 +22,6 @@

 . config/options $1

-$SCRIPTS/build busybox-hosttools
-
 VER=`ls $BUILD/linux*/modules/lib/modules`

 if [ "$TARGET_ARCH" = i386 ]; then
@ -40,11 +38,6 @@ fi
 mkdir -p $INSTALL/lib/modules/$VER/ati
  cp $PKG_BUILD/common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $INSTALL/lib/modules/$VER/ati

-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done
-
 # X.Org modules
 mkdir -p $INSTALL/$XORG_PATH_MODULES
  cp -P $PKG_BUILD/$BASEDIR/usr/X11R6/$LIBDIR/modules/*.so $INSTALL/$XORG_PATH_MODULES
--- a/packages/x11/driver/xf86-video-nvidia/install
+++ b/packages/x11/driver/xf86-video-nvidia/install
@ -22,8 +22,6 @@

 . config/options $1

-$SCRIPTS/build busybox-hosttools
-
 VER=`ls $BUILD/linux*/modules/lib/modules`

 mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
@ -46,11 +44,6 @@ mkdir -p $INSTALL/usr/lib
 mkdir -p $INSTALL/lib/modules/$VER/nvidia
  cp $PKG_BUILD/kernel/nvidia.ko $INSTALL/lib/modules/$VER/nvidia

-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done
-
 mkdir -p $INSTALL/usr/bin
  cp $PKG_BUILD/nvidia-smi $INSTALL/usr/bin

--- a/scripts/image
+++ b/scripts/image
@ -26,6 +26,7 @@ $SCRIPTS/checkdeps build
 $SCRIPTS/build toolchain
 $SCRIPTS/build squashfs
 $SCRIPTS/build fakeroot
+$SCRIPTS/build busybox-hosttools

 export INSTALL=$BUILD/image/system

@ -146,6 +147,13 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
 # OEM packages
  [ "$OEM_SUPPORT" = "yes" ] && $SCRIPTS/install oem

+# run depmod
+  KVER=`ls $BUILD/linux-*/modules/lib/modules`
+  $ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $KVER > /dev/null
+  for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
+    rm -f $i
+  done
+
 # strip kernel modules
  for MOD in `find $INSTALL/lib/modules/ -name *.ko`; do
    $STRIP --strip-debug $MOD