From 64785d2ca9832ebd89265a76c660c9289aabb21b Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 17 May 2019 15:13:14 +0200 Subject: [PATCH 01/10] initramfs: drop dependency on linux:init Signed-off-by: Matthias Reichl --- packages/virtual/initramfs/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk index b278804659..ae5cec6b00 100644 --- a/packages/virtual/initramfs/package.mk +++ b/packages/virtual/initramfs/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain libc:init busybox:init linux:init plymouth-lite:init util-linux:init e2fsprogs:init dosfstools:init fakeroot:host" +PKG_DEPENDS_TARGET="toolchain libc:init busybox:init plymouth-lite:init util-linux:init e2fsprogs:init dosfstools:init fakeroot:host" PKG_SECTION="virtual" PKG_LONGDESC="debug is a Metapackage for installing initramfs" From 54d1135476be5ecfd0fcfce4ac1ab81004427a7e Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 17 May 2019 15:14:20 +0200 Subject: [PATCH 02/10] linux: drop obsolete make_init and makeinstall_init functions Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 5d0a920ab6..3a6fd5d3dd 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -259,31 +259,6 @@ makeinstall_target() { fi } -make_init() { - : # reuse make_target() -} - -makeinstall_init() { - if [ -n "$INITRAMFS_MODULES" ]; then - mkdir -p $INSTALL/etc - mkdir -p $INSTALL/usr/lib/modules - - for i in $INITRAMFS_MODULES; do - module=`find .install_pkg/$(get_full_module_dir)/kernel -name $i.ko` - if [ -n "$module" ]; then - echo $i >> $INSTALL/etc/modules - cp $module $INSTALL/usr/lib/modules/`basename $module` - fi - done - fi - - if [ "$UVESAFB_SUPPORT" = yes ]; then - mkdir -p $INSTALL/usr/lib/modules - uvesafb=`find .install_pkg/$(get_full_module_dir)/kernel -name uvesafb.ko` - cp $uvesafb $INSTALL/usr/lib/modules/`basename $uvesafb` - fi -} - post_install() { mkdir -p $INSTALL/$(get_full_firmware_dir)/ From c4a382c2a0ec5b9fe234f220c33700ac9703e2f4 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 17 May 2019 15:15:53 +0200 Subject: [PATCH 03/10] linux: move initramfs build+installation to pre_make_target Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 3a6fd5d3dd..3e007b2971 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -127,6 +127,11 @@ makeinstall_host() { } pre_make_target() { + ( cd $ROOT + rm -rf $BUILD/initramfs + $SCRIPTS/install initramfs + ) + if [ "$TARGET_ARCH" = "x86_64" ]; then # copy some extra firmware to linux tree mkdir -p $PKG_BUILD/external-firmware @@ -185,11 +190,6 @@ make_target() { ) fi - ( cd $ROOT - rm -rf $BUILD/initramfs - $SCRIPTS/install initramfs - ) - # arm64 target does not support creating uImage. # Build Image first, then wrap it using u-boot's mkimage. if [[ "$TARGET_KERNEL_ARCH" = "arm64" && "$KERNEL_TARGET" = uImage* ]]; then From 317667558cfeda4a45602beb023f902775174e0d Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 17 May 2019 15:18:17 +0200 Subject: [PATCH 04/10] drop INITRAMFS_MODULES option Signed-off-by: Matthias Reichl --- config/show_config | 4 ---- projects/Allwinner/options | 3 --- projects/Generic/options | 3 --- projects/RPi/options | 3 --- projects/Rockchip/options | 3 --- 5 files changed, 16 deletions(-) diff --git a/config/show_config b/config/show_config index c74c1f027c..29b004f0fe 100644 --- a/config/show_config +++ b/config/show_config @@ -81,10 +81,6 @@ show_config() { config_message="$config_message\n - Include firmware:\t\t\t $config_firmware" done - for config_modules in $INITRAMFS_MODULES; do - config_message="$config_message\n - Initramfs modules:\t\t\t $config_modules" - done - # Network service configuration config_message="$config_message\n\n Network service configuration:" diff --git a/projects/Allwinner/options b/projects/Allwinner/options index e15f0dcdef..6db717ae30 100644 --- a/projects/Allwinner/options +++ b/projects/Allwinner/options @@ -60,9 +60,6 @@ # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap) KODIPLAYER_DRIVER="$OPENGLES" - # Modules to install in initramfs for early boot - INITRAMFS_MODULES="" - # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" diff --git a/projects/Generic/options b/projects/Generic/options index 075636bd9f..85682c91d1 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -68,9 +68,6 @@ # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap) KODIPLAYER_DRIVER="default" - # Modules to install in initramfs for early boot - INITRAMFS_MODULES="" - # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" diff --git a/projects/RPi/options b/projects/RPi/options index 3b4219d9a6..ee44dd639a 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -94,9 +94,6 @@ # KODI Player implementation to use (default / bcm2835-driver / mesa) KODIPLAYER_DRIVER="bcm2835-driver" - # Modules to install in initramfs for early boot - INITRAMFS_MODULES="" - # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" diff --git a/projects/Rockchip/options b/projects/Rockchip/options index bc5d7e3a1b..6c093e5544 100644 --- a/projects/Rockchip/options +++ b/projects/Rockchip/options @@ -52,9 +52,6 @@ # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap) KODIPLAYER_DRIVER="$OPENGLES" - # Modules to install in initramfs for early boot - INITRAMFS_MODULES="" - # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" From 9e9657981a47332823b86e45587b77180868e9e4 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 17 May 2019 15:20:48 +0200 Subject: [PATCH 05/10] drop UVESAFB_SUPPORT option Signed-off-by: Matthias Reichl --- config/show_config | 1 - packages/tools/plymouth-lite/package.mk | 4 ---- projects/Allwinner/options | 3 --- projects/Generic/options | 3 --- projects/RPi/options | 3 --- projects/Rockchip/options | 3 --- 6 files changed, 17 deletions(-) diff --git a/config/show_config b/config/show_config index 29b004f0fe..eede23c9ee 100644 --- a/config/show_config +++ b/config/show_config @@ -36,7 +36,6 @@ show_config() { fi config_message="$config_message\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)" config_message="$config_message\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)" - config_message="$config_message\n - uvesafb support:\t\t\t $UVESAFB_SUPPORT" # Hardware decoder support diff --git a/packages/tools/plymouth-lite/package.mk b/packages/tools/plymouth-lite/package.mk index 98d05d8b7e..59f39a7283 100644 --- a/packages/tools/plymouth-lite/package.mk +++ b/packages/tools/plymouth-lite/package.mk @@ -10,10 +10,6 @@ PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS_INIT="toolchain gcc:init libpng" PKG_LONGDESC="Boot splash screen based on Fedora's Plymouth code" -if [ "$UVESAFB_SUPPORT" = yes ]; then - PKG_DEPENDS_INIT="$PKG_DEPENDS_INIT v86d:init" -fi - pre_configure_init() { # plymouth-lite dont support to build in subdirs cd $PKG_BUILD diff --git a/projects/Allwinner/options b/projects/Allwinner/options index 6db717ae30..a34cc07d92 100644 --- a/projects/Allwinner/options +++ b/projects/Allwinner/options @@ -43,9 +43,6 @@ # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) OPENGLES="libmali" - # include uvesafb support (yes / no) - UVESAFB_SUPPORT="no" - # Displayserver to use (x11 / no) DISPLAYSERVER="no" diff --git a/projects/Generic/options b/projects/Generic/options index 85682c91d1..a41d376159 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -59,9 +59,6 @@ # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) OPENGLES="no" - # include uvesafb support (yes / no) - UVESAFB_SUPPORT="yes" - # Displayserver to use (x11 / no) DISPLAYSERVER="x11" diff --git a/projects/RPi/options b/projects/RPi/options index ee44dd639a..296bd995ee 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -74,9 +74,6 @@ # OpenGL-ES implementation to use (no / bcm2835-driver / mesa) OPENGLES="bcm2835-driver" - # include uvesafb support (yes / no) - UVESAFB_SUPPORT="no" - # Displayserver to use (x11 / no) DISPLAYSERVER="no" diff --git a/projects/Rockchip/options b/projects/Rockchip/options index 6c093e5544..b4bb3ea157 100644 --- a/projects/Rockchip/options +++ b/projects/Rockchip/options @@ -32,9 +32,6 @@ # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) OPENGLES="libmali" - # include uvesafb support (yes / no) - UVESAFB_SUPPORT="no" - # Displayserver to use (weston / no) DISPLAYSERVER="no" From 7f52096b6db5a473348eecffe1c3ab191cdd41e5 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 17 May 2019 15:22:07 +0200 Subject: [PATCH 06/10] busybox: drop uvesafb module handling in init Signed-off-by: Matthias Reichl --- packages/sysutils/busybox/scripts/init | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 52bb05b7aa..616d552d79 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -374,12 +374,6 @@ load_splash() { if [ ! "$SPLASH" = "no" ]; then progress "Loading bootsplash" - # load uvesafb module if needed - if [ -f "$MODULE_DIR/uvesafb.ko" -a ! -e /dev/fb0 ]; then - progress "Loading kernel module uvesafb.ko" - insmod "$MODULE_DIR/uvesafb.ko" && set_default_res=yes || progress "... Failed to load kernel module uvesafb, skipping" - fi - if [ -e /dev/fb0 ]; then # Set framebuffer to a custom resolution and/or fallback to default resolution (1024x768-32), if required. if [ ! "$SWITCH_FRAMEBUFFER" = "no" ]; then From 4e23e4d52689e74510ff25553dc53dcb64662c6e Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 17 May 2019 15:23:13 +0200 Subject: [PATCH 07/10] v86d: drop no longer used package Signed-off-by: Matthias Reichl --- packages/sysutils/v86d/package.mk | 25 ------------------- .../patches/v86d-0.1.10-crosscompiling.patch | 12 --------- ...6d-0.1.10-dont-include-kernelheaders.patch | 18 ------------- 3 files changed, 55 deletions(-) delete mode 100644 packages/sysutils/v86d/package.mk delete mode 100644 packages/sysutils/v86d/patches/v86d-0.1.10-crosscompiling.patch delete mode 100644 packages/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch diff --git a/packages/sysutils/v86d/package.mk b/packages/sysutils/v86d/package.mk deleted file mode 100644 index 2a2355d494..0000000000 --- a/packages/sysutils/v86d/package.mk +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="v86d" -PKG_VERSION="0.1.10" -PKG_SHA256="634964ae18ef68c8493add2ce150e3b4502badeb0d9194b4bd81241d25e6735c" -PKG_ARCH="x86_64" -PKG_LICENSE="GPL" -PKG_SITE="http://dev.gentoo.org/~spock/projects/uvesafb/" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_INIT="toolchain gcc:init" -PKG_LONGDESC="v86d is the userspace helper that runs x86 code in an emulated environment." - -pre_configure_init() { - INIT_CONFIGURE_OPTS="--with-x86emu" - -# v86d fails to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME-init -} - -makeinstall_init() { - DESTDIR=$INSTALL/usr make install -} diff --git a/packages/sysutils/v86d/patches/v86d-0.1.10-crosscompiling.patch b/packages/sysutils/v86d/patches/v86d-0.1.10-crosscompiling.patch deleted file mode 100644 index f4acf7fd0f..0000000000 --- a/packages/sysutils/v86d/patches/v86d-0.1.10-crosscompiling.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur v86d-0.1.10/libs/x86emu/Makefile v86d-0.1.10.patch/libs/x86emu/Makefile ---- v86d-0.1.10/libs/x86emu/Makefile 2011-02-25 22:27:39.000000000 +0100 -+++ v86d-0.1.10.patch/libs/x86emu/Makefile 2012-06-28 20:15:36.486234182 +0200 -@@ -1,7 +1,7 @@ - OBJS = decode.o fpu.o ops.o ops2.o prim_ops.o sys.o - - libx86emu.a: $(OBJS) -- ar rv $@ $+ -+ $(AR) rv $@ $+ - - %.o: %.c - $(CC) -c $(CFLAGS) -o $@ $< diff --git a/packages/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch b/packages/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch deleted file mode 100644 index c188f05538..0000000000 --- a/packages/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur v86d-0.1.10/Makefile v86d-0.1.10.patch/Makefile ---- v86d-0.1.10/Makefile 2011-02-25 22:27:39.000000000 +0100 -+++ v86d-0.1.10.patch/Makefile 2013-01-14 19:20:13.385465794 +0100 -@@ -3,14 +3,12 @@ - .PHONY: clean install install_testvbe x86emu lrmi - - INSTALL = install --KDIR ?= /lib/modules/$(shell uname -r)/source - - ifeq ($(call config_opt,CONFIG_KLIBC),true) - export CC = klcc - endif - - CFLAGS ?= -Wall -g -O2 --CFLAGS += -I$(KDIR)/include - - ifeq ($(call config_opt,CONFIG_X86EMU),true) - CFLAGS += -Ilibs/x86emu From 529bbede4a2090cad0d30fd7859ce510a51a787a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 17 May 2019 15:34:02 +0200 Subject: [PATCH 08/10] linux (Generic): disable UVESA framebuffer support Signed-off-by: Matthias Reichl --- projects/Generic/linux/linux.x86_64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 05e131d90b..4ddc305412 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -3758,7 +3758,7 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_VGA16 is not set -CONFIG_FB_UVESA=m +# CONFIG_FB_UVESA is not set # CONFIG_FB_VESA is not set CONFIG_FB_EFI=y # CONFIG_FB_N411 is not set From fee2cc37d9a439e1d360b3c2d250c9d0b17e3136 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 17 May 2019 15:38:30 +0200 Subject: [PATCH 09/10] linux: build linux image before building modules Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 3e007b2971..2b56da0963 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -152,7 +152,18 @@ pre_make_target() { } make_target() { - kernel_make modules + # arm64 target does not support creating uImage. + # Build Image first, then wrap it using u-boot's mkimage. + if [[ "$TARGET_KERNEL_ARCH" = "arm64" && "$KERNEL_TARGET" = uImage* ]]; then + if [ -z "$KERNEL_UIMAGE_LOADADDR" -o -z "$KERNEL_UIMAGE_ENTRYADDR" ]; then + die "ERROR: KERNEL_UIMAGE_LOADADDR and KERNEL_UIMAGE_ENTRYADDR have to be set to build uImage - aborting" + fi + KERNEL_UIMAGE_TARGET="$KERNEL_TARGET" + KERNEL_TARGET="${KERNEL_TARGET/uImage/Image}" + fi + + kernel_make $KERNEL_TARGET $KERNEL_MAKE_EXTRACMD modules + kernel_make INSTALL_MOD_PATH=$INSTALL/$(get_kernel_overlay_dir) modules_install rm -f $INSTALL/$(get_kernel_overlay_dir)/lib/modules/*/build rm -f $INSTALL/$(get_kernel_overlay_dir)/lib/modules/*/source @@ -190,21 +201,6 @@ make_target() { ) fi - # arm64 target does not support creating uImage. - # Build Image first, then wrap it using u-boot's mkimage. - if [[ "$TARGET_KERNEL_ARCH" = "arm64" && "$KERNEL_TARGET" = uImage* ]]; then - if [ -z "$KERNEL_UIMAGE_LOADADDR" -o -z "$KERNEL_UIMAGE_ENTRYADDR" ]; then - die "ERROR: KERNEL_UIMAGE_LOADADDR and KERNEL_UIMAGE_ENTRYADDR have to be set to build uImage - aborting" - fi - KERNEL_UIMAGE_TARGET="$KERNEL_TARGET" - KERNEL_TARGET="${KERNEL_TARGET/uImage/Image}" - fi - - # the modules target is required to get a proper Module.symvers - # file with symbols from built-in and external modules. - # Without that it'll contain only the symbols from the kernel - kernel_make $KERNEL_TARGET $KERNEL_MAKE_EXTRACMD modules - if [ -n "$KERNEL_UIMAGE_TARGET" ] ; then # determine compression used for kernel image KERNEL_UIMAGE_COMP=${KERNEL_UIMAGE_TARGET:7} From 4e80b7e9dc2c70ff99c8f3046ab5a3aded291ceb Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 17 May 2019 15:38:40 +0200 Subject: [PATCH 10/10] linux: move module installation to makeinstall_target Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 2b56da0963..7d848f2b63 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -164,10 +164,6 @@ make_target() { kernel_make $KERNEL_TARGET $KERNEL_MAKE_EXTRACMD modules - kernel_make INSTALL_MOD_PATH=$INSTALL/$(get_kernel_overlay_dir) modules_install - rm -f $INSTALL/$(get_kernel_overlay_dir)/lib/modules/*/build - rm -f $INSTALL/$(get_kernel_overlay_dir)/lib/modules/*/source - if [ "$PKG_BUILD_PERF" = "yes" ] ; then ( cd tools/perf @@ -232,6 +228,10 @@ make_target() { } makeinstall_target() { + kernel_make INSTALL_MOD_PATH=$INSTALL/$(get_kernel_overlay_dir) modules_install + rm -f $INSTALL/$(get_kernel_overlay_dir)/lib/modules/*/build + rm -f $INSTALL/$(get_kernel_overlay_dir)/lib/modules/*/source + if [ "$BOOTLOADER" = "u-boot" ]; then mkdir -p $INSTALL/usr/share/bootloader for dtb in arch/$TARGET_KERNEL_ARCH/boot/dts/*.dtb arch/$TARGET_KERNEL_ARCH/boot/dts/*/*.dtb; do