From a591acae2435ca83b7fd8e3905cf6103c5ad0d32 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Mon, 16 Jun 2025 19:08:58 +0200 Subject: [PATCH] samsung-kylessopen: move to archived Fix up some bits, but it's too broken to easily fix for now. Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6675 --- .../device-samsung-kylessopen/APKBUILD | 1 + .../device-samsung-kylessopen/deviceinfo | 0 .../0001-fix-video-argb-setting.patch | 0 .../linux-samsung-kylessopen/APKBUILD | 17 ++++-- ...of-rate-parameter-for-struct-clk_ops.patch | 56 +++++++++++++++++++ .../config-samsung-kylessopen.armv7 | 0 .../linux-samsung-kylessopen/gcc5.patch | 0 ...give-up-on-ilog2-const-optimizations.patch | 0 .../gcc8-fix-put-user.patch | 0 ...ce-Sun-Solaris-style-flag-on-section.patch | 1 + 10 files changed, 70 insertions(+), 5 deletions(-) rename device/{downstream => archived}/device-samsung-kylessopen/APKBUILD (93%) rename device/{downstream => archived}/device-samsung-kylessopen/deviceinfo (100%) rename device/{downstream => archived}/linux-samsung-kylessopen/0001-fix-video-argb-setting.patch (100%) rename device/{downstream => archived}/linux-samsung-kylessopen/APKBUILD (61%) create mode 100644 device/archived/linux-samsung-kylessopen/Fix-datatype-of-rate-parameter-for-struct-clk_ops.patch rename device/{downstream => archived}/linux-samsung-kylessopen/config-samsung-kylessopen.armv7 (100%) rename device/{downstream => archived}/linux-samsung-kylessopen/gcc5.patch (100%) rename device/{downstream => archived}/linux-samsung-kylessopen/gcc7-give-up-on-ilog2-const-optimizations.patch (100%) rename device/{downstream => archived}/linux-samsung-kylessopen/gcc8-fix-put-user.patch (100%) create mode 120000 device/archived/linux-samsung-kylessopen/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch diff --git a/device/downstream/device-samsung-kylessopen/APKBUILD b/device/archived/device-samsung-kylessopen/APKBUILD similarity index 93% rename from device/downstream/device-samsung-kylessopen/APKBUILD rename to device/archived/device-samsung-kylessopen/APKBUILD index c9f99e00d..76ef882f4 100644 --- a/device/downstream/device-samsung-kylessopen/APKBUILD +++ b/device/archived/device-samsung-kylessopen/APKBUILD @@ -1,3 +1,4 @@ +# Archived: Kernel does not build anymore # Reference: pkgname=device-samsung-kylessopen pkgdesc="Galaxy Trend" diff --git a/device/downstream/device-samsung-kylessopen/deviceinfo b/device/archived/device-samsung-kylessopen/deviceinfo similarity index 100% rename from device/downstream/device-samsung-kylessopen/deviceinfo rename to device/archived/device-samsung-kylessopen/deviceinfo diff --git a/device/downstream/linux-samsung-kylessopen/0001-fix-video-argb-setting.patch b/device/archived/linux-samsung-kylessopen/0001-fix-video-argb-setting.patch similarity index 100% rename from device/downstream/linux-samsung-kylessopen/0001-fix-video-argb-setting.patch rename to device/archived/linux-samsung-kylessopen/0001-fix-video-argb-setting.patch diff --git a/device/downstream/linux-samsung-kylessopen/APKBUILD b/device/archived/linux-samsung-kylessopen/APKBUILD similarity index 61% rename from device/downstream/linux-samsung-kylessopen/APKBUILD rename to device/archived/linux-samsung-kylessopen/APKBUILD index d06d60fb6..34db6e48a 100644 --- a/device/downstream/linux-samsung-kylessopen/APKBUILD +++ b/device/archived/linux-samsung-kylessopen/APKBUILD @@ -1,3 +1,5 @@ +# Archived: Kernel does not build anymore +# net/bluetooth/rfcomm/sock.c:1043:27: error: initialization of 'int (*)(struct net *, struct socket *, int, int)' from incompatible pointer type 'int (*)(struct net *, struct socket *, int)' [-Wincompatible-pointer-types] # Reference: # Kernel config based on: arch/arm/configs/franken_defconfig @@ -13,17 +15,18 @@ license="GPL-2.0-only" options="!strip !check !tracedeps pmb:cross-native" makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev lzo xz" -# Source: backup of https://github.com/pavlepiramida/FrankenKernel -_kernel="pavlepiramida-frankenkernel" +_kernel="FrankenKernel" _commit="d0e853abec2d7be79f5d9b319273a0b66046b125" _config="config-$_flavor.$arch" source=" - $pkgname-$_commit.tar.gz::https://gitlab.com/samsung-kylessopen-kernels/$_kernel/-/archive/$_commit/$_kernel-$_commit.tar.gz + $pkgname-$_commit.tar.gz::https://github.com/pavlepiramida/$_kernel/archive/$_commit.tar.gz $_config gcc5.patch 0001-fix-video-argb-setting.patch gcc7-give-up-on-ilog2-const-optimizations.patch gcc8-fix-put-user.patch + linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch + Fix-datatype-of-rate-parameter-for-struct-clk_ops.patch " builddir="$srcdir/$_kernel-$_commit" @@ -42,9 +45,13 @@ package() { downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" } -sha512sums="874957ad6a6c959b5479ece21225d9423f62e67a6a4c1f9a9e56d0c6078b6644a4ff2e490c7e43a8ef5241b148af6085b041f02268586cf8c61b1eacfd3511ad linux-samsung-kylessopen-d0e853abec2d7be79f5d9b319273a0b66046b125.tar.gz +sha512sums=" +22c89caaae880c64fb1a9e25ff5c65813b4bfa9a27ca4310fe9da17c4a1bfff2b49b4516f48fd30a4ccb1a185fc525b0c5967b4f18bfd3c2f8cfce66c8a268bd linux-samsung-kylessopen-d0e853abec2d7be79f5d9b319273a0b66046b125.tar.gz 89c6bb98a9bafa1942a07cc6de7eae8c66df1afdac9fc78ad391c531357f28791b87da51632df6b05765f7758bb7ffc5f67146cfd7fd401b275d4e7badb7f7ee config-samsung-kylessopen.armv7 db5d16e03a93b453c98882dcd08b7a4cd96c126393365d8916d9cf045e8725831f70ea841756526af7bead36a74301024e3c569c438442906e079fea2ac0a022 gcc5.patch e3083c260ed9c4fc0d83f43106700b6173876dbfae072f6e6696ac6785a4dc17771fbcb3e21601e04ed29a11bf0f7a2a09ad549375e0c34cea245c7f2e2bcbbd 0001-fix-video-argb-setting.patch 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch -197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch" +197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch +66ab793bb1fa50a07f10e2cdb0f49ea05a787c6b1fe5358e69a76e43295ac5be3b68cdf6a882e868bfe6969cac981c5545587cd57eee4b5cec26078ae0ecaa1c linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch +1729fadf353dd3920d5492f4f483380ae4388fe25aa1df656b1715f2927d9050cec21fe94382ac7dd58181689f7805a9c73cb082366df5d84d729a32b25de349 Fix-datatype-of-rate-parameter-for-struct-clk_ops.patch +" diff --git a/device/archived/linux-samsung-kylessopen/Fix-datatype-of-rate-parameter-for-struct-clk_ops.patch b/device/archived/linux-samsung-kylessopen/Fix-datatype-of-rate-parameter-for-struct-clk_ops.patch new file mode 100644 index 000000000..e649417b3 --- /dev/null +++ b/device/archived/linux-samsung-kylessopen/Fix-datatype-of-rate-parameter-for-struct-clk_ops.patch @@ -0,0 +1,56 @@ +From f5e476291f6b5d35fc4deacd73f6647300dd7ea5 Mon Sep 17 00:00:00 2001 +From: Luca Weiss +Date: Mon, 16 Jun 2025 19:46:38 +0200 +Subject: [PATCH] Fix datatype of rate parameter for struct clk_ops + +Fixes the following compile error: + + arch/arm/mach-msm/clock-voter.c:177:21: error: initialization of 'int (*)(struct clk *, unsigned int)' from incompatible pointer type 'int (*)(struct clk *, long unsigned int)' [-Wincompatible-pointer-types] + +Signed-off-by: Luca Weiss +--- + arch/arm/mach-msm/clock-pcom.c | 4 ++-- + arch/arm/mach-msm/clock.h | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/arch/arm/mach-msm/clock-pcom.c b/arch/arm/mach-msm/clock-pcom.c +index 3edc4294..57467ea0 100755 +--- a/arch/arm/mach-msm/clock-pcom.c ++++ b/arch/arm/mach-msm/clock-pcom.c +@@ -101,14 +101,14 @@ static int _pc_clk_set_rate(struct clk *clk, unsigned long rate) + return (int)id < 0 ? -EINVAL : 0; + } + +-static int pc_clk_set_min_rate(struct clk *clk, unsigned rate) ++static int pc_clk_set_min_rate(struct clk *clk, unsigned long rate) + { + int rc; + int id = to_pcom_clk(clk)->id; + bool ignore_error = (cpu_is_msm7x27() && id == P_EBI1_CLK && + rate >= INT_MAX); + +- rc = msm_proc_comm(PCOM_CLKCTL_RPC_MIN_RATE, &id, &rate); ++ rc = msm_proc_comm(PCOM_CLKCTL_RPC_MIN_RATE, &id, (unsigned *)&rate); + if (rc < 0) + return rc; + else if (ignore_error) +diff --git a/arch/arm/mach-msm/clock.h b/arch/arm/mach-msm/clock.h +index 3cc77b17..0f94d1cd 100755 +--- a/arch/arm/mach-msm/clock.h ++++ b/arch/arm/mach-msm/clock.h +@@ -71,9 +71,9 @@ struct clk_ops { + int (*in_hwcg_mode)(struct clk *clk); + int (*handoff)(struct clk *clk); + int (*reset)(struct clk *clk, enum clk_reset_action action); +- int (*set_rate)(struct clk *clk, unsigned rate); +- int (*set_min_rate)(struct clk *clk, unsigned rate); +- int (*set_max_rate)(struct clk *clk, unsigned rate); ++ int (*set_rate)(struct clk *clk, unsigned long rate); ++ int (*set_min_rate)(struct clk *clk, unsigned long rate); ++ int (*set_max_rate)(struct clk *clk, unsigned long rate); + int (*set_flags)(struct clk *clk, unsigned flags); + unsigned long (*get_rate)(struct clk *clk); + int (*list_rate)(struct clk *clk, unsigned n); +-- +2.49.0 + diff --git a/device/downstream/linux-samsung-kylessopen/config-samsung-kylessopen.armv7 b/device/archived/linux-samsung-kylessopen/config-samsung-kylessopen.armv7 similarity index 100% rename from device/downstream/linux-samsung-kylessopen/config-samsung-kylessopen.armv7 rename to device/archived/linux-samsung-kylessopen/config-samsung-kylessopen.armv7 diff --git a/device/downstream/linux-samsung-kylessopen/gcc5.patch b/device/archived/linux-samsung-kylessopen/gcc5.patch similarity index 100% rename from device/downstream/linux-samsung-kylessopen/gcc5.patch rename to device/archived/linux-samsung-kylessopen/gcc5.patch diff --git a/device/downstream/linux-samsung-kylessopen/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/archived/linux-samsung-kylessopen/gcc7-give-up-on-ilog2-const-optimizations.patch similarity index 100% rename from device/downstream/linux-samsung-kylessopen/gcc7-give-up-on-ilog2-const-optimizations.patch rename to device/archived/linux-samsung-kylessopen/gcc7-give-up-on-ilog2-const-optimizations.patch diff --git a/device/downstream/linux-samsung-kylessopen/gcc8-fix-put-user.patch b/device/archived/linux-samsung-kylessopen/gcc8-fix-put-user.patch similarity index 100% rename from device/downstream/linux-samsung-kylessopen/gcc8-fix-put-user.patch rename to device/archived/linux-samsung-kylessopen/gcc8-fix-put-user.patch diff --git a/device/archived/linux-samsung-kylessopen/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/device/archived/linux-samsung-kylessopen/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch new file mode 120000 index 000000000..128f8a274 --- /dev/null +++ b/device/archived/linux-samsung-kylessopen/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch \ No newline at end of file