diff --git a/linux-4.19.37-260.bee b/linux-4.19.37-260.bee index ad5f99782..448686b0d 100755 --- a/linux-4.19.37-260.bee +++ b/linux-4.19.37-260.bee @@ -29,50 +29,6 @@ same_revision_files=$(ls ${BEE_PKGDIR}/linux-[0-9].[0-9]*-${PKGREVISION}.x86_64. && echo "A kernel with revision ${PKGREVISION} has already been build: $same_revision_files" \ && exit -plaininstall_for_modules() { - local dir=$1 - local tar=$2 - local url=$3 - local xflags=$4 - ( - test -e $tar || wget $url - test -d $dir || tar xvf $tar - cd $dir - ./configure \ - --prefix=/usr \ - --with-linux=${S} \ - --with-linux-obj=${B} \ - $xflags - cd module - # depmod call fails when build as user, and would eventually mess up system dirs when run as root - sed -i -e 's/depmod/echo skipping depmod/' Makefile - make ${BEE_MAKEFLAGS} - make modules_install INSTALL_MOD_PATH=${D} - ) -} - -build_spl_zfs_extra_modules_and_do_depmod() { - pushd . - - local SPL_ZFS_VERSION=0.7.12 - echo "spl/zfs" - - mkdir -pv ${B}/spl_zfs_extra - cd ${B}/spl_zfs_extra - - plaininstall_for_modules spl-${SPL_ZFS_VERSION} spl-${SPL_ZFS_VERSION}.tar.gz \ - https://github.com/zfsonlinux/zfs/releases/download/zfs-${SPL_ZFS_VERSION}/spl-${SPL_ZFS_VERSION}.tar.gz - - plaininstall_for_modules zfs-${SPL_ZFS_VERSION} zfs-${SPL_ZFS_VERSION}.tar.gz \ - https://github.com/zfsonlinux/zfs/releases/download/zfs-${SPL_ZFS_VERSION}/zfs-${SPL_ZFS_VERSION}.tar.gz \ - "--with-spl=${B}/spl_zfs_extra/spl-${SPL_ZFS_VERSION}" - - cd ${D}/lib/modules/${FULLKERNELVERSION} - depmod -a -b ${D} ${FULLKERNELVERSION} - - popd -} - mee_patch() { echo "PATCH $@" bee_patch $@ @@ -942,8 +898,6 @@ mee_install() { make install INSTALL_PATH=${D}/boot # make firmware_install INSTALL_MOD_PATH=${D} - build_spl_zfs_extra_modules_and_do_depmod - rm -v ${D}/lib/modules/${FULLKERNELVERSION}/{source,build} ln -sv /usr/src/linux/${PKGALLPKG}/source ${D}/lib/modules/${FULLKERNELVERSION}/source