diff --git a/packages/linux-drivers/AF9035/install b/packages/linux-drivers/AF9035/install index d6ae5e6c2e..8d14198583 100755 --- 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 diff --git a/packages/linux-drivers/AF9035/meta b/packages/linux-drivers/AF9035/meta index 67803f5d29..5a10f15ee5 100644 --- 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" diff --git a/packages/linux-drivers/a867_drv/install b/packages/linux-drivers/a867_drv/install index 238f6a8dc2..d31dae7330 100755 --- 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 diff --git a/packages/linux-drivers/a867_drv/meta b/packages/linux-drivers/a867_drv/meta index 7178a7209e..cee50485a5 100644 --- 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" diff --git a/packages/linux-drivers/asix-ax887xx/install b/packages/linux-drivers/asix-ax887xx/install index 22d7f9193e..1265bf3cbf 100755 --- 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 diff --git a/packages/linux-drivers/asix-ax887xx/meta b/packages/linux-drivers/asix-ax887xx/meta index fe3d033f7f..9716d8038b 100644 --- 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" diff --git a/packages/linux-drivers/bcm_sta/install b/packages/linux-drivers/bcm_sta/install index 14c895425d..067e2d299a 100755 --- 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 diff --git a/packages/linux-drivers/bcm_sta/meta b/packages/linux-drivers/bcm_sta/meta index 540b86a4bd..0dfff5c60d 100644 --- 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" diff --git a/packages/linux/install b/packages/linux/install index a2162fbb64..3164ccfa44 100755 --- 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 ] && \ diff --git a/packages/multimedia/crystalhd/install b/packages/multimedia/crystalhd/install index 4015b22193..b39ef43bc2 100755 --- 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 diff --git a/packages/multimedia/crystalhd/meta b/packages/multimedia/crystalhd/meta index d2dd717cde..f3e3bb4152 100644 --- 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." diff --git a/packages/x11/driver/xf86-video-fglrx/install b/packages/x11/driver/xf86-video-fglrx/install index 98965e03b2..165db6f21b 100755 --- 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 diff --git a/packages/x11/driver/xf86-video-nvidia/install b/packages/x11/driver/xf86-video-nvidia/install index c2ef9a73d2..10ffeebe25 100755 --- 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 diff --git a/scripts/image b/scripts/image index f2ae1a0bd7..edee6cb589 100755 --- 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