jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: drop amlogic-3.14 kernel, drop building Android kernel image

Browse Source
This commit is contained in:
kszaq 2019-04-25 21:17:43 +02:00 committed by MilhouseVH
parent 7bd39a17c5
commit 3c36022773
1 changed files with 5 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
packages/linux/package.mk
View File

@ -16,14 +16,6 @@ PKG_STAMP="$KERNEL_TARGET $KERNEL_MAKE_EXTRACMD"
PKG_PATCH_DIRS="$LINUX" PKG_PATCH_DIRS="$LINUX"
case "$LINUX" in case "$LINUX" in
amlogic-3.14)
PKG_VERSION="6d8fbb4ee61a7779ac57b5961e076f0c63ff8b65"
PKG_SHA256="ef05c88779c893f92e92e5315d0e5396f34c32289726c301fae7ffe8c4214227"
PKG_URL="https://github.com/LibreELEC/linux-amlogic/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET aml-dtbtools:host"
PKG_BUILD_PERF="no"
;;
rockchip-4.4) rockchip-4.4)
PKG_VERSION="aa8bacf821e5c8ae6dd8cae8d64011c741659945" PKG_VERSION="aa8bacf821e5c8ae6dd8cae8d64011c741659945"
PKG_SHA256="a2760fe89a15aa7be142fd25fb08ebd357c5d855c41f1612cf47c6e89de39bb3" PKG_SHA256="a2760fe89a15aa7be142fd25fb08ebd357c5d855c41f1612cf47c6e89de39bb3"
@ -65,16 +57,8 @@ if [[ "$KERNEL_TARGET" = uImage* ]]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET u-boot-tools:host" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET u-boot-tools:host"
fi fi
if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mkbootimg:host"
fi
post_patch() { post_patch() {
cp $PKG_KERNEL_CFG_FILE $PKG_BUILD/.config cp $PKG_KERNEL_CFG_FILE $PKG_BUILD/.config
if [ ! "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$BUILD/image/initramfs.cpio\"|" $PKG_BUILD/.config
sed -i -e '/^CONFIG_INITRAMFS_SOURCE=*./ a CONFIG_INITRAMFS_ROOT_UID=0\nCONFIG_INITRAMFS_ROOT_GID=0' $PKG_BUILD/.config
fi
# set default hostname based on $DISTRONAME # set default hostname based on $DISTRONAME
sed -i -e "s|@DISTRONAME@|$DISTRONAME|g" $PKG_BUILD/.config sed -i -e "s|@DISTRONAME@|$DISTRONAME|g" $PKG_BUILD/.config
@ -218,27 +202,6 @@ make_target() {
# Without that it'll contain only the symbols from the kernel # Without that it'll contain only the symbols from the kernel
kernel_make $KERNEL_TARGET $KERNEL_MAKE_EXTRACMD modules kernel_make $KERNEL_TARGET $KERNEL_MAKE_EXTRACMD modules
if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
DTB_BLOBS=($(ls arch/$TARGET_KERNEL_ARCH/boot/dts/amlogic/*.dtb 2>/dev/null || true))
DTB_BLOBS_COUNT="${#DTB_BLOBS[@]}"
DTB_BLOB_OUTPUT="arch/$TARGET_KERNEL_ARCH/boot/dtb.img"
ANDROID_BOOTIMG_SECOND="--second $DTB_BLOB_OUTPUT"
if [ "$DTB_BLOBS_COUNT" -gt 1 ]; then
$TOOLCHAIN/bin/dtbTool -o arch/$TARGET_KERNEL_ARCH/boot/dtb.img -p scripts/dtc/ arch/$TARGET_KERNEL_ARCH/boot/dts/amlogic/
elif [ "$DTB_BLOBS_COUNT" -eq 1 ]; then
cp -PR $DTB_BLOBS $DTB_BLOB_OUTPUT
else
ANDROID_BOOTIMG_SECOND=""
fi
LDFLAGS="" mkbootimg --kernel arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET --ramdisk $BUILD/image/initramfs.cpio \
$ANDROID_BOOTIMG_SECOND $ANDROID_BOOTIMG_OPTIONS --output arch/$TARGET_KERNEL_ARCH/boot/boot.img
mv -f arch/$TARGET_KERNEL_ARCH/boot/boot.img arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET
fi
if [ -n "$KERNEL_UIMAGE_TARGET" ] ; then if [ -n "$KERNEL_UIMAGE_TARGET" ] ; then
# determine compression used for kernel image # determine compression used for kernel image
KERNEL_UIMAGE_COMP=${KERNEL_UIMAGE_TARGET:7} KERNEL_UIMAGE_COMP=${KERNEL_UIMAGE_TARGET:7}
@ -272,15 +235,11 @@ make_target() {
makeinstall_target() { makeinstall_target() {
if [ "$BOOTLOADER" = "u-boot" ]; then if [ "$BOOTLOADER" = "u-boot" ]; then
mkdir -p $INSTALL/usr/share/bootloader mkdir -p $INSTALL/usr/share/bootloader
if [ -d arch/$TARGET_KERNEL_ARCH/boot/dts/amlogic -a -f arch/$TARGET_KERNEL_ARCH/boot/dtb.img ]; then for dtb in arch/$TARGET_KERNEL_ARCH/boot/dts/*.dtb arch/$TARGET_KERNEL_ARCH/boot/dts/*/*.dtb; do
cp arch/$TARGET_KERNEL_ARCH/boot/dtb.img $INSTALL/usr/share/bootloader/dtb.img 2>/dev/null || : if [ -f $dtb ]; then
else cp -v $dtb $INSTALL/usr/share/bootloader
for dtb in arch/$TARGET_KERNEL_ARCH/boot/dts/*.dtb arch/$TARGET_KERNEL_ARCH/boot/dts/*/*.dtb; do fi
if [ -f $dtb ]; then done
cp -v $dtb $INSTALL/usr/share/bootloader
fi
done
fi
elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
mkdir -p $INSTALL/usr/share/bootloader/overlays mkdir -p $INSTALL/usr/share/bootloader/overlays