Skip to content

Commit

Permalink
linux-4.19.37: Remove ZFS
Browse files Browse the repository at this point in the history
Remove ZFS as decided by dvteam teatime 26.2.2019.
  • Loading branch information
donald committed May 2, 2019
1 parent 0a966bc commit 998ad2f
Showing 1 changed file with 0 additions and 46 deletions.
46 changes: 0 additions & 46 deletions linux-4.19.37-260.bee
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 998ad2f

Please sign in to comment.