mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
making init check for /flash/MACH_KERNEL instead of /flash/atv_single_boot for update forcefully disabling when 'nvidia' is in the list of GRAPHIC_DRIVERS letting atv-bootloader include default initrd in the kernel
This commit is contained in:
parent
e5112ab2d7
commit
097b4049f4
@ -120,7 +120,7 @@ REBOOT="0"
|
||||
|
||||
mount_part "$boot" "/flash" "ro,noatime"
|
||||
|
||||
if [ -f "/flash/atv_single_boot" ]; then
|
||||
if [ -f "/flash/MACH_KERNEL" ]; then
|
||||
IMAGE_KERNEL="MACH_KERNEL"
|
||||
fi
|
||||
|
||||
|
@ -41,6 +41,8 @@ cp $KERNEL_CFG_FILE $LINUX/.config
|
||||
sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD/image/initramfs.cpio\"|" \
|
||||
$LINUX/.config
|
||||
|
||||
# wipe out nouveau if GRAPHICS_DRIVERS contains nvidia
|
||||
echo $GRAPHIC_DRIVERS | grep "nvidia" &>/dev/null && sed -i '/NOUVEAU/ d' $LINUX/.config && echo "# CONFIG_DRM_NOUVEAU is not set" >> $LINUX/.config
|
||||
# copy some extra firmware to linux tree
|
||||
cp -R $PKG_DIR/firmware/* $LINUX/firmware
|
||||
|
||||
|
@ -27,7 +27,7 @@ cd $PKG_BUILD
|
||||
cp -PR $(kernel_path)/arch/x86/boot/bzImage vmlinuz
|
||||
|
||||
make clean
|
||||
make LDFLAGS="" KERN_OBJ="vmlinuz.obj" \
|
||||
make LDFLAGS="" \
|
||||
CC="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-gcc-4.0.1" \
|
||||
LD="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-ld"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user