From 6f27d8084cf2a911c4f05cf631a5c426d2a9a21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Duje=20Mihanovi=C4=87?= Date: Fri, 19 Sep 2025 15:18:27 +0200 Subject: [PATCH] lg-vee3e: Fix port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use gcc6 and add a few shared patches to make the kernel (and menuconfig) build again. Since it now works, move the aport back to downstream. The "new" initramfs does not work without an extra initfs, so enable that. Delete a few redundant deviceinfo properties while at it. Finally, change the red tint fix to a Kconfig option instead of a patch. [ci:skip-vercheck] # Package moved, complains despite pkgrel bump Signed-off-by: Duje Mihanović Part-of: --- .../archived/linux-lg-vee3e/gpu-imgtype.patch | 25 -------------- .../device-lg-vee3e/APKBUILD | 6 ++-- .../device-lg-vee3e/deviceinfo | 4 +-- .../02_gpu-msm-fix-gcc5-compile.patch | 0 .../linux-lg-vee3e/APKBUILD | 33 +++++++++++++++---- .../linux-lg-vee3e/config-lg-vee3e.armv7 | 4 +-- .../linux-lg-vee3e/fix-check-lxdialog.patch | 1 + ...cc10-extern_YYLOC_global_declaration.patch | 0 ...give-up-on-ilog2-const-optimizations.patch | 0 .../linux-lg-vee3e/gcc8-fix-put-user.patch | 0 ...ce-Sun-Solaris-style-flag-on-section.patch | 1 + .../linux3.4-fix-piggy.gzip.S.patch | 1 + ...Fix-proc-tid-fdinfo-fd-file-handling.patch | 0 .../static-inline-in-ftrace.h.patch | 0 14 files changed, 35 insertions(+), 40 deletions(-) delete mode 100644 device/archived/linux-lg-vee3e/gpu-imgtype.patch rename device/{archived => downstream}/device-lg-vee3e/APKBUILD (70%) rename device/{archived => downstream}/device-lg-vee3e/deviceinfo (89%) rename device/{archived => downstream}/linux-lg-vee3e/02_gpu-msm-fix-gcc5-compile.patch (100%) rename device/{archived => downstream}/linux-lg-vee3e/APKBUILD (69%) rename device/{archived => downstream}/linux-lg-vee3e/config-lg-vee3e.armv7 (99%) create mode 120000 device/downstream/linux-lg-vee3e/fix-check-lxdialog.patch rename device/{archived => downstream}/linux-lg-vee3e/gcc10-extern_YYLOC_global_declaration.patch (100%) rename device/{archived => downstream}/linux-lg-vee3e/gcc7-give-up-on-ilog2-const-optimizations.patch (100%) rename device/{archived => downstream}/linux-lg-vee3e/gcc8-fix-put-user.patch (100%) create mode 120000 device/downstream/linux-lg-vee3e/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch create mode 120000 device/downstream/linux-lg-vee3e/linux3.4-fix-piggy.gzip.S.patch rename device/{archived => downstream}/linux-lg-vee3e/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch (100%) rename device/{archived => downstream}/linux-lg-vee3e/static-inline-in-ftrace.h.patch (100%) diff --git a/device/archived/linux-lg-vee3e/gpu-imgtype.patch b/device/archived/linux-lg-vee3e/gpu-imgtype.patch deleted file mode 100644 index 6dad7d2dc..000000000 --- a/device/archived/linux-lg-vee3e/gpu-imgtype.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c -index 88b0d4fb..bc593ada 100644 ---- a/drivers/video/msm/msm_fb.c -+++ b/drivers/video/msm/msm_fb.c -@@ -1390,16 +1390,16 @@ static int msm_fb_register(struct msm_fb_data_type *mfd) - fix->xpanstep = 1; - fix->ypanstep = 1; - var->vmode = FB_VMODE_NONINTERLACED; -- var->blue.offset = 8; -- var->green.offset = 16; -- var->red.offset = 24; -+ var->blue.offset = 0; -+ var->green.offset = 8; -+ var->red.offset = 16; - var->blue.length = 8; - var->green.length = 8; - var->red.length = 8; - var->blue.msb_right = 0; - var->green.msb_right = 0; - var->red.msb_right = 0; -- var->transp.offset = 0; -+ var->transp.offset = 24; - var->transp.length = 8; - bpp = 4; - break; diff --git a/device/archived/device-lg-vee3e/APKBUILD b/device/downstream/device-lg-vee3e/APKBUILD similarity index 70% rename from device/archived/device-lg-vee3e/APKBUILD rename to device/downstream/device-lg-vee3e/APKBUILD index 521ebfb50..6682ed485 100644 --- a/device/archived/device-lg-vee3e/APKBUILD +++ b/device/downstream/device-lg-vee3e/APKBUILD @@ -1,8 +1,8 @@ -# Archived: Kernel does not build anymore # Reference: +maintainer="Duje Mihanović " pkgname=device-lg-vee3e pkgdesc="LG Optimus L3 II" -pkgver=2 +pkgver=3 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -21,5 +21,5 @@ package() { } sha512sums=" -3396ccc8e4287a5c75522dcc830a0114e50249c905e3b940d12cd09500a342a3b3834fa22fa9159b3edbc33b7e3f387c8c78cf0929b11cf16edf0876cfbc0955 deviceinfo +79bda0c316da3b181c27662e1db90e9b563c5368d84bca38aabead0ca0e8203f3dce30eb4655fcc264282e2ce927c4b6c3a3008e6cd0a549b2d35b324ca65a4a deviceinfo " diff --git a/device/archived/device-lg-vee3e/deviceinfo b/device/downstream/device-lg-vee3e/deviceinfo similarity index 89% rename from device/archived/device-lg-vee3e/deviceinfo rename to device/downstream/device-lg-vee3e/deviceinfo index 297ae995c..a7a4d3ab4 100644 --- a/device/archived/device-lg-vee3e/deviceinfo +++ b/device/downstream/device-lg-vee3e/deviceinfo @@ -11,7 +11,6 @@ deviceinfo_arch="armv7" # Device related deviceinfo_chassis="handset" -deviceinfo_keyboard="false" deviceinfo_external_storage="true" deviceinfo_screen_width="240" deviceinfo_screen_height="320" @@ -20,8 +19,7 @@ deviceinfo_screen_height="320" deviceinfo_flash_method="fastboot" deviceinfo_kernel_cmdline="androidboot.hardware=vee3 androidboot.selinux=permissive" deviceinfo_generate_bootimg="true" -deviceinfo_bootimg_qcdt="false" -deviceinfo_bootimg_dtb_second="false" +deviceinfo_create_initfs_extra="true" deviceinfo_flash_offset_base="0x00200000" deviceinfo_flash_offset_kernel="0x00008000" deviceinfo_flash_offset_ramdisk="0x01200000" diff --git a/device/archived/linux-lg-vee3e/02_gpu-msm-fix-gcc5-compile.patch b/device/downstream/linux-lg-vee3e/02_gpu-msm-fix-gcc5-compile.patch similarity index 100% rename from device/archived/linux-lg-vee3e/02_gpu-msm-fix-gcc5-compile.patch rename to device/downstream/linux-lg-vee3e/02_gpu-msm-fix-gcc5-compile.patch diff --git a/device/archived/linux-lg-vee3e/APKBUILD b/device/downstream/linux-lg-vee3e/APKBUILD similarity index 69% rename from device/archived/linux-lg-vee3e/APKBUILD rename to device/downstream/linux-lg-vee3e/APKBUILD index 5b6b5625e..c6a5ad670 100644 --- a/device/archived/linux-lg-vee3e/APKBUILD +++ b/device/downstream/linux-lg-vee3e/APKBUILD @@ -1,10 +1,9 @@ -# Archived: Kernel does not build anymore # Reference: # Kernel config based on: arch/arm/configs/cyanogenmod_vee3_defconfig - +maintainer="Duje Mihanović " pkgname=linux-lg-vee3e pkgver=3.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="LG Optimus L3 II kernel fork" arch="armv7" _carch="arm" @@ -12,7 +11,23 @@ _flavor="lg-vee3e" url="https://kernel.org" license="GPL-2.0-only" options="!strip !check !tracedeps pmb:cross-native" -makedepends="bash bc bison devicepkg-dev flex openssl-dev perl" +makedepends=" + bash + bc + bison + devicepkg-dev + flex + gcc6 + openssl-dev + perl +" + +# Compiler: GCC 6 (doesn't compile with newer versions) +if [ "${CC:0:5}" != "gcc6-" ]; then + CC="gcc6-$CC" + HOSTCC="gcc6-gcc" + CROSS_COMPILE="gcc6-$CROSS_COMPILE" +fi # Source _repository="lge-kernel-lproj" @@ -26,8 +41,10 @@ source=" gcc10-extern_YYLOC_global_declaration.patch static-inline-in-ftrace.h.patch 02_gpu-msm-fix-gcc5-compile.patch - gpu-imgtype.patch + linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch + linux3.4-fix-piggy.gzip.S.patch linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch + fix-check-lxdialog.patch " builddir="$srcdir/$_repository-$_commit" _outdir="out" @@ -49,12 +66,14 @@ package() { sha512sums=" b73f5d8a87eaea99489b3ed090ef5219438779a9ba8de4716be9d6a0b8f8e88e56ae493cc9b9efdd1736bc061f174a61576f0b99a9f75e8c613fc09bd01a7d86 linux-lg-vee3e-45d6b0c683f3e0178e91c081133c6ebbea1d30fd.tar.gz -8502243ac38457f8d27bfe8e5223784a1ab37db33c4f066ca1b15315eb4429cc82a24f7a0222fbbe8a20e92103edee5cb0e0d5632765a1d3c296c7a94edce142 config-lg-vee3e.armv7 +eb06f0570964fcfdb5c3195e8194381ed3ae4d762029a4759dcb4c05e26b6f76e05b1340bdbe6b6b5e36a3835fe11a2509fa7f7294aa48b20f3bfb6724150dcd config-lg-vee3e.armv7 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864 static-inline-in-ftrace.h.patch 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch -1b1c2bc6baca3baccd115473669b28b5cf580f574d82c1b08fabebd89f09dfb94d4ae89e301cca554feaff2af5bffa041e6880e974b4a391b93dcba4f9af7801 gpu-imgtype.patch +9e3b067fa1b19ad02500c4fce1b6142051df3845c508e615788beb650c4f953683107ac2d80670c4e3df38f532e0e91060d2d13ec04c9ec985abd2dfa82e900b linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch +080745ca4ecaa804ee1df26ea81975ca93b74372e0c08322a6c481e97807495ae6ceb6cc77653afa24f9f2df45da8ebf8e5de6b06037fbb08e0279877ce42188 linux3.4-fix-piggy.gzip.S.patch 5e81c20b0b30c1ab09bd59f1e1b77fcce945a27de8144c68617ddc5e8f10e1f6fa8b1e4cd5d63e43511d61dace46fb26b14a6227a667b9718d44c8b81dbe6100 linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch +182be3c596b9cc267ac108d7cf03fc8c328ccc6b36770800e4dcedea8d1bb65e3f5eacf590c2948f58b1418cc60a1670ba77dde8c259e428d158c31b6e1dbaf5 fix-check-lxdialog.patch " diff --git a/device/archived/linux-lg-vee3e/config-lg-vee3e.armv7 b/device/downstream/linux-lg-vee3e/config-lg-vee3e.armv7 similarity index 99% rename from device/archived/linux-lg-vee3e/config-lg-vee3e.armv7 rename to device/downstream/linux-lg-vee3e/config-lg-vee3e.armv7 index 762eb92a4..95b433eac 100644 --- a/device/archived/linux-lg-vee3e/config-lg-vee3e.armv7 +++ b/device/downstream/linux-lg-vee3e/config-lg-vee3e.armv7 @@ -2436,8 +2436,8 @@ CONFIG_FB_MSM_EBI2_TOVIS_QVGA=y # CONFIG_FB_MSM_HDMI_COMMON is not set # CONFIG_FB_MSM_HDMI_3D is not set # CONFIG_FB_MSM_DEFAULT_DEPTH_RGB565 is not set -# CONFIG_FB_MSM_DEFAULT_DEPTH_ARGB8888 is not set -CONFIG_FB_MSM_DEFAULT_DEPTH_RGBA8888=y +CONFIG_FB_MSM_DEFAULT_DEPTH_ARGB8888=y +# CONFIG_FB_MSM_DEFAULT_DEPTH_RGBA8888 is not set # CONFIG_FB_MSM_EBI2_EPSON_S1D_QVGA_PANEL is not set # CONFIG_FB_MSM_EBI2_PANEL_DETECT is not set # CONFIG_FB_MSM_QPIC_ILI_QVGA_PANEL is not set diff --git a/device/downstream/linux-lg-vee3e/fix-check-lxdialog.patch b/device/downstream/linux-lg-vee3e/fix-check-lxdialog.patch new file mode 120000 index 000000000..bfb5653df --- /dev/null +++ b/device/downstream/linux-lg-vee3e/fix-check-lxdialog.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/fix-check-lxdialog.patch \ No newline at end of file diff --git a/device/archived/linux-lg-vee3e/gcc10-extern_YYLOC_global_declaration.patch b/device/downstream/linux-lg-vee3e/gcc10-extern_YYLOC_global_declaration.patch similarity index 100% rename from device/archived/linux-lg-vee3e/gcc10-extern_YYLOC_global_declaration.patch rename to device/downstream/linux-lg-vee3e/gcc10-extern_YYLOC_global_declaration.patch diff --git a/device/archived/linux-lg-vee3e/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/downstream/linux-lg-vee3e/gcc7-give-up-on-ilog2-const-optimizations.patch similarity index 100% rename from device/archived/linux-lg-vee3e/gcc7-give-up-on-ilog2-const-optimizations.patch rename to device/downstream/linux-lg-vee3e/gcc7-give-up-on-ilog2-const-optimizations.patch diff --git a/device/archived/linux-lg-vee3e/gcc8-fix-put-user.patch b/device/downstream/linux-lg-vee3e/gcc8-fix-put-user.patch similarity index 100% rename from device/archived/linux-lg-vee3e/gcc8-fix-put-user.patch rename to device/downstream/linux-lg-vee3e/gcc8-fix-put-user.patch diff --git a/device/downstream/linux-lg-vee3e/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/device/downstream/linux-lg-vee3e/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch new file mode 120000 index 000000000..858243081 --- /dev/null +++ b/device/downstream/linux-lg-vee3e/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch \ No newline at end of file diff --git a/device/downstream/linux-lg-vee3e/linux3.4-fix-piggy.gzip.S.patch b/device/downstream/linux-lg-vee3e/linux3.4-fix-piggy.gzip.S.patch new file mode 120000 index 000000000..e5975978e --- /dev/null +++ b/device/downstream/linux-lg-vee3e/linux3.4-fix-piggy.gzip.S.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch \ No newline at end of file diff --git a/device/archived/linux-lg-vee3e/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch b/device/downstream/linux-lg-vee3e/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch similarity index 100% rename from device/archived/linux-lg-vee3e/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch rename to device/downstream/linux-lg-vee3e/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch diff --git a/device/archived/linux-lg-vee3e/static-inline-in-ftrace.h.patch b/device/downstream/linux-lg-vee3e/static-inline-in-ftrace.h.patch similarity index 100% rename from device/archived/linux-lg-vee3e/static-inline-in-ftrace.h.patch rename to device/downstream/linux-lg-vee3e/static-inline-in-ftrace.h.patch