diff --git a/device/downstream/device-samsung-jxelte/APKBUILD b/device/downstream/device-samsung-j7xelte/APKBUILD similarity index 61% rename from device/downstream/device-samsung-jxelte/APKBUILD rename to device/downstream/device-samsung-j7xelte/APKBUILD index bd0dfbcf7..31cf7cfbc 100644 --- a/device/downstream/device-samsung-jxelte/APKBUILD +++ b/device/downstream/device-samsung-j7xelte/APKBUILD @@ -1,13 +1,14 @@ # Reference: -pkgname=device-samsung-jxelte -pkgdesc="Samsung Galaxy J7(2016)" +# Maintainer: bluebunny +pkgname=device-samsung-j7xelte +pkgdesc="Samsung Galaxy J7 (2016)" pkgver=3 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base postmarketos-base-downstream linux-samsung-jxelte mkbootimg msm-fb-refresher" +depends="postmarketos-base postmarketos-base-downstream linux-samsung-j7xelte mkbootimg msm-fb-refresher" makedepends="devicepkg-dev" source="deviceinfo" subpackages="$pkgname-nonfree-firmware:nonfree_firmware" @@ -22,10 +23,10 @@ package() { nonfree_firmware() { pkgdesc="Wifi firmware" - depends="firmware-samsung-jxelte" + depends="firmware-samsung-j7xelte" mkdir "$subpkgdir" } sha512sums=" -f74d1d2ea51a0fc3778548700f401132b3351d1437ca48cefcc766bbfa77d619f86dd91b9859bc2600d4b6932aeb9185d916c1398b890d88b66175d7c4d05871 deviceinfo +0ddf3e711951aac8c7361d9266d82896fc427def81b3d2ecb6fdfac8b3cf46804d558e158d11e68cc14311a6aed85dc9ecb509795dcdbfb761bdae045112c0ac deviceinfo " diff --git a/device/downstream/device-samsung-jxelte/deviceinfo b/device/downstream/device-samsung-j7xelte/deviceinfo similarity index 82% rename from device/downstream/device-samsung-jxelte/deviceinfo rename to device/downstream/device-samsung-j7xelte/deviceinfo index dd7cfa201..9df667e2a 100644 --- a/device/downstream/device-samsung-jxelte/deviceinfo +++ b/device/downstream/device-samsung-j7xelte/deviceinfo @@ -3,9 +3,9 @@ # scripts. deviceinfo_format_version="0" -deviceinfo_name="Samsung Galaxy J7(2016)" +deviceinfo_name="Samsung Galaxy J7 (2016)" deviceinfo_manufacturer="Samsung" -deviceinfo_codename="samsung-jxelte" +deviceinfo_codename="samsung-j7xelte" deviceinfo_year="2016" deviceinfo_arch="aarch64" @@ -17,7 +17,6 @@ deviceinfo_screen_height="1280" # Bootloader related deviceinfo_flash_method="heimdall-bootimg" -deviceinfo_kernel_cmdline="androidboot.selinux=permissive androidboot.selinux=permissive" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="true" deviceinfo_flash_offset_kernel="0x00008000" @@ -26,4 +25,6 @@ deviceinfo_flash_offset_second="0x00f00000" deviceinfo_flash_offset_tags="0x00000100" deviceinfo_flash_pagesize="2048" deviceinfo_flash_heimdall_partition_kernel="BOOT" +deviceinfo_flash_heimdall_partition_rootfs="USERDATA" deviceinfo_flash_sparse="true" +deviceinfo_flash_sparse_samsung_format="1" \ No newline at end of file diff --git a/device/downstream/firmware-samsung-jxelte/APKBUILD b/device/downstream/firmware-samsung-j7xelte/APKBUILD similarity index 76% rename from device/downstream/firmware-samsung-jxelte/APKBUILD rename to device/downstream/firmware-samsung-j7xelte/APKBUILD index 9a7410c49..055b03ddc 100644 --- a/device/downstream/firmware-samsung-jxelte/APKBUILD +++ b/device/downstream/firmware-samsung-j7xelte/APKBUILD @@ -1,7 +1,8 @@ -pkgname=firmware-samsung-jxelte +# Maintainer: bluebunny +pkgname=firmware-samsung-j7xelte pkgver=1 -pkgrel=1 -pkgdesc="Samsung Galaxy J7 2016 Firmware" +pkgrel=0 +pkgdesc="Samsung Galaxy J7 (2016) Firmware" url="https://gitlab.com/android_samsung_universal7870" arch="aarch64" license="proprietary" @@ -33,7 +34,7 @@ package() { } sha512sums=" -3a70de63fc0a842306fc05f66f75ac2fcf7b7726b1a195cf6746c49bb0b563e994c46f6f02c4ad3e3a14819cbc5d5ba930ef0ab720aa1cd2a4839a1d04bf0096 firmware-samsung-jxelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-bcmdhd_sta.bin -c34bb422662fcfb604ff0942a294d3b8ec360e07ca5b4a586472d42ec37ba60776e010f99f56ce511c5a1779c438605ec7a0fd965dece9b3b70b9e093d7913e3 firmware-samsung-jxelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-nvram.txt -1aef3df174f07204e59d099242cb2d0ad63d957583723bd9423be5d316c2aa426e9136bfedde8d3b3080b99fb608e6ffce9ca4f419080b79f9bf00732ec99d57 firmware-samsung-jxelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-mfc_fw.bin +3a70de63fc0a842306fc05f66f75ac2fcf7b7726b1a195cf6746c49bb0b563e994c46f6f02c4ad3e3a14819cbc5d5ba930ef0ab720aa1cd2a4839a1d04bf0096 firmware-samsung-j7xelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-bcmdhd_sta.bin +c34bb422662fcfb604ff0942a294d3b8ec360e07ca5b4a586472d42ec37ba60776e010f99f56ce511c5a1779c438605ec7a0fd965dece9b3b70b9e093d7913e3 firmware-samsung-j7xelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-nvram.txt +1aef3df174f07204e59d099242cb2d0ad63d957583723bd9423be5d316c2aa426e9136bfedde8d3b3080b99fb608e6ffce9ca4f419080b79f9bf00732ec99d57 firmware-samsung-j7xelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-mfc_fw.bin " diff --git a/device/downstream/linux-samsung-jxelte/0002-fix-usb-gadget-random-mac.patch b/device/downstream/linux-samsung-j7xelte/0002-fix-usb-gadget-random-mac.patch similarity index 100% rename from device/downstream/linux-samsung-jxelte/0002-fix-usb-gadget-random-mac.patch rename to device/downstream/linux-samsung-j7xelte/0002-fix-usb-gadget-random-mac.patch diff --git a/device/downstream/linux-samsung-jxelte/01-fix-dtb.patch b/device/downstream/linux-samsung-j7xelte/01-fix-dtb.patch similarity index 100% rename from device/downstream/linux-samsung-jxelte/01-fix-dtb.patch rename to device/downstream/linux-samsung-j7xelte/01-fix-dtb.patch diff --git a/device/downstream/linux-samsung-jxelte/02-fix-video-argb-setting.patch b/device/downstream/linux-samsung-j7xelte/02-fix-video-argb-setting.patch similarity index 100% rename from device/downstream/linux-samsung-jxelte/02-fix-video-argb-setting.patch rename to device/downstream/linux-samsung-j7xelte/02-fix-video-argb-setting.patch diff --git a/device/downstream/linux-samsung-j7xelte/03-Makefile-ignore-bundled-toolchain.patch b/device/downstream/linux-samsung-j7xelte/03-Makefile-ignore-bundled-toolchain.patch new file mode 100644 index 000000000..fd668ba81 --- /dev/null +++ b/device/downstream/linux-samsung-j7xelte/03-Makefile-ignore-bundled-toolchain.patch @@ -0,0 +1,20 @@ +From aedfcba925841807c0d401eb55ffbdd9d57ef16b Mon Sep 17 00:00:00 2001 +From: Henrik Grimler +Date: Fri, 27 Jun 2025 11:17:12 +0200 +Subject: [PATCH] Makefile: ignore bundled toolchain + +Use the gcc from the system instead. +--- +diff --git a/Makefile b/Makefile +index dc4c2fa6..4710528d 100644 +--- a/Makefile ++++ b/Makefile +@@ -249,7 +249,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \ + # Default value for CROSS_COMPILE is not to prefix executables + # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile + ARCH ?= arm64 +-CROSS_COMPILE ?= ../PLATFORM/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android- ++# CROSS_COMPILE ?= ../PLATFORM/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android- + + # Architecture as present in compile.h + UTS_MACHINE := $(ARCH) \ No newline at end of file diff --git a/device/downstream/linux-samsung-jxelte/APKBUILD b/device/downstream/linux-samsung-j7xelte/APKBUILD similarity index 83% rename from device/downstream/linux-samsung-jxelte/APKBUILD rename to device/downstream/linux-samsung-j7xelte/APKBUILD index 71142861d..b7926394d 100644 --- a/device/downstream/linux-samsung-jxelte/APKBUILD +++ b/device/downstream/linux-samsung-j7xelte/APKBUILD @@ -1,13 +1,12 @@ # Reference: -# Kernel config based on: arch/arm64/configs/device_j7xelte_xx - -pkgname=linux-samsung-jxelte +# Maintainer: bluebunny +pkgname=linux-samsung-j7xelte pkgver=3.18.14 -pkgrel=7 -pkgdesc="Samsung Galaxy J7(2016) kernel fork" +pkgrel=0 +pkgdesc="Samsung Galaxy J7 (2016) kernel fork" arch="aarch64" _carch="arm64" -_flavor="samsung-jxelte" +_flavor="samsung-j7xelte" url="https://kernel.org" license="GPL-2.0-only" options="!strip !check !tracedeps pmb:cross-native" @@ -25,6 +24,7 @@ source=" gcc8-fix-put-user.patch 01-fix-dtb.patch 02-fix-video-argb-setting.patch + 03-Makefile-ignore-bundled-toolchain.patch linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch 0002-fix-usb-gadget-random-mac.patch disable-charging-bootmode.patch @@ -67,13 +67,14 @@ package() { } sha512sums=" -e6602a988b66a632114b431743a170fca15f069f3eb5f743d2859bf9d0de020faaeabbf3a9b574a2f3b1167efb04a42c7d818ecff2e730d268d24966e73b16c4 linux-samsung-jxelte-6a08243a47caf497bf07d34baacbf7e822344b24.tar.gz -bb4602115d838abf7b1c2f442e33eb76569e30e1dcf9031a054cd56c599460029ccec8d6406ac01175cacde8f89a1ca1f601864ea7c09f151151b9058530e3d9 config-samsung-jxelte.aarch64 +e6602a988b66a632114b431743a170fca15f069f3eb5f743d2859bf9d0de020faaeabbf3a9b574a2f3b1167efb04a42c7d818ecff2e730d268d24966e73b16c4 linux-samsung-j7xelte-6a08243a47caf497bf07d34baacbf7e822344b24.tar.gz +48c3c78a9ce6e03f2a4c739607897c82235e2a96bbd17d336ceed437b8140d9c88461163739dc42b3f6a7226e18788d7c7b57b6064d04737163ab93f198b235a config-samsung-j7xelte.aarch64 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch 1ea1501b7b7f1ab3ef4c54a74c01183c96b0403b0a57e3f7c37f299c5c338b86ef5e281a7273b97e87dae5a8d49ffa8a7a3e55d433e34fb53d97fbffdc631d55 01-fix-dtb.patch 3156b7badd136700ba6332a6d20844ed00452d0a89eda81c32a7d008f61bec1a694d6afbddc35e1f5ffbd400d1119e176361b7e9647ea7edd4310f2cf4ba5caa 02-fix-video-argb-setting.patch +3cb0cf7888eeb9ac8e17f11cb8db6343e2e16185010f263b2c5cb335cbc87d001b1fd2c4aa2f81b65fd1093f24000c8a1b8e856e362c2b574cad0b5afcfed8aa 03-Makefile-ignore-bundled-toolchain.patch 75545ccd0082a119b9ad95fcef3523c939a5c946f8f3a5c3dde15cee1502f6c1011050a0ad5359426f018bb7ceea1c97a28c7665941bc89f365c8d11065ce0f6 linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch 0b1836f86020e9e7701f0cf0819149a8f079b69eab87ef301ded7753cda77207a6fff00103dbd5c2a5f60493b46d060ead5967ea800e55ae29fc651b49aab41a 0002-fix-usb-gadget-random-mac.patch 32e51c6171bcb72b15f5f11a9c9b3279e03e630f2ea6d14b66fbfdd8a8c1587bdb7e88698197e9a81e05c47dba08d13c1ff4a5e4692d14b042f07dd2006c1cc0 disable-charging-bootmode.patch diff --git a/device/downstream/linux-samsung-jxelte/config-samsung-jxelte.aarch64 b/device/downstream/linux-samsung-j7xelte/config-samsung-j7xelte.aarch64 similarity index 99% rename from device/downstream/linux-samsung-jxelte/config-samsung-jxelte.aarch64 rename to device/downstream/linux-samsung-j7xelte/config-samsung-j7xelte.aarch64 index 28bfa0ee7..7122ef095 100644 --- a/device/downstream/linux-samsung-jxelte/config-samsung-jxelte.aarch64 +++ b/device/downstream/linux-samsung-j7xelte/config-samsung-j7xelte.aarch64 @@ -517,7 +517,7 @@ CONFIG_IP_PNP_RARP=y # CONFIG_NET_IPGRE_DEMUX is not set CONFIG_NET_IP_TUNNEL=y # CONFIG_IP_MROUTE is not set -# CONFIG_SYN_COOKIES is not set +CONFIG_SYN_COOKIES=y # CONFIG_NET_IPVTI is not set # CONFIG_NET_UDP_TUNNEL is not set # CONFIG_NET_FOU is not set diff --git a/device/downstream/linux-samsung-jxelte/disable-charging-bootmode.patch b/device/downstream/linux-samsung-j7xelte/disable-charging-bootmode.patch similarity index 100% rename from device/downstream/linux-samsung-jxelte/disable-charging-bootmode.patch rename to device/downstream/linux-samsung-j7xelte/disable-charging-bootmode.patch diff --git a/device/downstream/linux-samsung-jxelte/gcc10-extern_YYLOC_global_declaration.patch b/device/downstream/linux-samsung-j7xelte/gcc10-extern_YYLOC_global_declaration.patch similarity index 100% rename from device/downstream/linux-samsung-jxelte/gcc10-extern_YYLOC_global_declaration.patch rename to device/downstream/linux-samsung-j7xelte/gcc10-extern_YYLOC_global_declaration.patch diff --git a/device/downstream/linux-samsung-jxelte/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/downstream/linux-samsung-j7xelte/gcc7-give-up-on-ilog2-const-optimizations.patch similarity index 100% rename from device/downstream/linux-samsung-jxelte/gcc7-give-up-on-ilog2-const-optimizations.patch rename to device/downstream/linux-samsung-j7xelte/gcc7-give-up-on-ilog2-const-optimizations.patch diff --git a/device/downstream/linux-samsung-jxelte/gcc8-fix-put-user.patch b/device/downstream/linux-samsung-j7xelte/gcc8-fix-put-user.patch similarity index 100% rename from device/downstream/linux-samsung-jxelte/gcc8-fix-put-user.patch rename to device/downstream/linux-samsung-j7xelte/gcc8-fix-put-user.patch diff --git a/device/downstream/linux-samsung-jxelte/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch b/device/downstream/linux-samsung-j7xelte/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch similarity index 100% rename from device/downstream/linux-samsung-jxelte/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch rename to device/downstream/linux-samsung-j7xelte/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch