From 7c35890137f1932fc4271c3c92eea0ce8ae19ded Mon Sep 17 00:00:00 2001 From: Chris Blake Date: Sun, 16 Jun 2024 14:11:19 -0500 Subject: [PATCH] fix: ubnthal cleaning Removing these fully now as we do not need to rely on them anymore. --- overlay/filesystem/usr/lib/init/boot/ubnt-init.sh | 1 - scripts/docker/run_debootstrap.sh | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/overlay/filesystem/usr/lib/init/boot/ubnt-init.sh b/overlay/filesystem/usr/lib/init/boot/ubnt-init.sh index 5d2f842..8976a19 100755 --- a/overlay/filesystem/usr/lib/init/boot/ubnt-init.sh +++ b/overlay/filesystem/usr/lib/init/boot/ubnt-init.sh @@ -3,7 +3,6 @@ case "$1" in start) # Load our kernel modules - # /usr/sbin/modprobe ubnthal # No longer needed, ubnteeprom replaced it in userspace /usr/sbin/modprobe ubnt-mtd-lock # Force our /dev/mtd* as RO /usr/sbin/modprobe btrfs diff --git a/scripts/docker/run_debootstrap.sh b/scripts/docker/run_debootstrap.sh index 50ab9a4..bc9cbc8 100755 --- a/scripts/docker/run_debootstrap.sh +++ b/scripts/docker/run_debootstrap.sh @@ -24,6 +24,10 @@ chroot "${build_path}/rootfs" /debootstrap/debootstrap --second-stage mv -f "${build_path}/fw-extract/${BOARD}-rootfs/lib/modules" "${build_path}/rootfs/lib" cp "${build_path}/fw-extract/${firmware_filename%.bin}/kernel.bin" "${build_path}/rootfs/boot/uImage" +# We can burn ubnt's proprietary modules, so we don't bundle in this IP! +rm "${build_path}/rootfs/lib/modules/4.19.152-alpine-unvr/extra/ubnt_common.ko" \ + "${build_path}/rootfs/lib/modules/4.19.152-alpine-unvr/extra/ubnthal.ko" + # Now, for the old kernel we built, pull in our extra modules we need! (depmod is done in bootstrap) cp "${build_path}/kernel/kernel-modules/lib/modules/4.19.152-alpine-unvr/kernel/lib/zstd/zstd_compress.ko" "${build_path}/rootfs/lib/modules/4.19.152-alpine-unvr/extra/" cp "${build_path}/kernel/kernel-modules/lib/modules/4.19.152-alpine-unvr/kernel/fs/btrfs/btrfs.ko" "${build_path}/rootfs/lib/modules/4.19.152-alpine-unvr/extra/"