diff --git a/app-mobilephone/pinephone-meta/pinephone-meta-0.3.ebuild b/app-mobilephone/pinephone-meta/pinephone-meta-0.3.ebuild index 2219802..2dd0218 100755 --- a/app-mobilephone/pinephone-meta/pinephone-meta-0.3.ebuild +++ b/app-mobilephone/pinephone-meta/pinephone-meta-0.3.ebuild @@ -10,7 +10,6 @@ DESCRIPTION="Meta-package for installing phosh on pinephone" LICENSE="GPL-3" SLOT="0" KEYWORDS="~arm64" -IUSE="+eg25-manager" RDEPEND=" app-mobilephone/pinephone-modem-scripts diff --git a/dev-embedded/u-boot-pinephone-pro/u-boot-pinephone-pro-2022.07.ebuild b/dev-embedded/u-boot-pinephone-pro/u-boot-pinephone-pro-2022.07.ebuild index 133617f..f1861ee 100755 --- a/dev-embedded/u-boot-pinephone-pro/u-boot-pinephone-pro-2022.07.ebuild +++ b/dev-embedded/u-boot-pinephone-pro/u-boot-pinephone-pro-2022.07.ebuild @@ -81,7 +81,7 @@ src_compile() { HOSTLDFLAGS="${BUILD_LDFLAGS}" ) - echo "CONFIG_IDENT_STRING=' Gentoo Linux'" >> .config + echo "CONFIG_IDENT_STRING='Gentoo Linux'" >> .config echo "CONFIG_BOOTDELAY'='0'" >> .config echo "CONFIG_SPL_DM_SEQ_ALIAS='y'" >> .config echo "CONFIG_SF_DEFAULT_BUS='1'" >> .config diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest deleted file mode 100644 index c5622c6..0000000 --- a/dev-libs/wayland/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef diff --git a/dev-libs/wayland/wayland-1.19.0.ebuild b/dev-libs/wayland/wayland-1.19.0.ebuild deleted file mode 100644 index 058e90a..0000000 --- a/dev-libs/wayland/wayland-1.19.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git" - inherit git-r3 -else - SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi -inherit meson-multilib - -DESCRIPTION="Wayland protocol libraries" -HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland" - -LICENSE="MIT" -SLOT="0" -IUSE="doc" - -BDEPEND=" - ~dev-util/wayland-scanner-${PV}[$MULTILIB_USEDEP] - virtual/pkgconfig - doc? ( - >=app-doc/doxygen-1.6[dot] - app-text/xmlto - >=media-gfx/graphviz-2.26.0 - ) -" -DEPEND=" - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - dev-libs/libxml2:= - >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -multilib_src_configure() { - local emesonargs=( - $(meson_native_use_bool doc documentation) - $(meson_native_true dtd_validation) - -Dlibraries=true - -Dscanner=false - ) - meson_src_configure -} - -src_test() { - # We set it on purpose to only a short subdir name, as socket paths are - # created in there, which are 108 byte limited. With this it hopefully - # barely fits to the limit with /var/tmp/portage/${CATEGORY}/${PF}/temp/x - export XDG_RUNTIME_DIR="${T}"/x - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || die - - multilib-minimal_src_test -} diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest deleted file mode 100644 index c5622c6..0000000 --- a/dev-util/wayland-scanner/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef diff --git a/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild deleted file mode 100644 index 0e0f4d7..0000000 --- a/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git" - inherit git-r3 -else - SRC_URI="https://wayland.freedesktop.org/releases/wayland-${PV}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - S="${WORKDIR}/wayland-${PV}" -fi -inherit meson-multilib - -DESCRIPTION="wayland-scanner tool" -HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland" - -LICENSE="MIT" -SLOT="0" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - !=dev-libs/expat-2.1.0-r3:=[$MULTILIB_USEDEP] -" -DEPEND="${RDEPEND}" - -multilib_src_configure() { - local emesonargs=( - -Ddocumentation=false - -Ddtd_validation=false - -Dlibraries=false - -Dscanner=true - ) - meson_src_configure -} diff --git a/sys-kernel/pinephone-pro-sources/files/config-ppp b/sys-kernel/pinephone-pro-sources/files/config-ppp index b1add75..36817a7 100755 --- a/sys-kernel/pinephone-pro-sources/files/config-ppp +++ b/sys-kernel/pinephone-pro-sources/files/config-ppp @@ -4,17 +4,18 @@ # CONFIG_CC_VERSION_TEXT="gcc (Gentoo 11.3.0 p4) 11.3.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=110200 +CONFIG_GCC_VERSION=110300 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23800 +CONFIG_AS_VERSION=23700 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23800 +CONFIG_LD_VERSION=23700 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -161,6 +162,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC12_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -1439,6 +1441,7 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=y CONFIG_RASPBERRYPI_FIRMWARE=y # CONFIG_ARM_FFA_TRANSPORT is not set # CONFIG_GOOGLE_FIRMWARE is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_ARM_PSCI_FW=y # CONFIG_ARM_PSCI_CHECKER is not set CONFIG_HAVE_ARM_SMCCC=y @@ -3524,6 +3527,8 @@ CONFIG_VIDEO_OV8858=m # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_ET8EK8 is not set # CONFIG_VIDEO_M5MOLS is not set +# CONFIG_VIDEO_HM5065 is not set +# CONFIG_VIDEO_GC2145 is not set # end of Camera sensor devices # @@ -6611,6 +6616,7 @@ CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_SM3=m # end of Crypto library routines +CONFIG_LIB_MEMNEQ=y CONFIG_CRC_CCITT=y CONFIG_CRC16=y CONFIG_CRC_T10DIF=y diff --git a/sys-kernel/pinephone-pro-sources/pinephone-pro-sources-5.18.6.ebuild b/sys-kernel/pinephone-pro-sources/pinephone-pro-sources-5.18.6.ebuild index fab8b27..e5be7c1 100644 --- a/sys-kernel/pinephone-pro-sources/pinephone-pro-sources-5.18.6.ebuild +++ b/sys-kernel/pinephone-pro-sources/pinephone-pro-sources-5.18.6.ebuild @@ -23,8 +23,7 @@ MEGI_TAG="orange-pi-5.18-20220615-1100" SRC_URI="https://github.com/megous/linux/archive/${MEGI_TAG}.tar.gz ${GENPATCHES_URI}" PATCHES=( - ${FILESDIR}/patch-5.18.4-5 - ${FILESDIR}/patch-5.18.5-6 + ) S="${WORKDIR}/linux-${MEGI_TAG}" diff --git a/sys-kernel/pinephone-sources/files/dts-pinephone-drop-modem-power-node.patch b/sys-kernel/pinephone-sources/files/dts-pinephone-drop-modem-power-node.patch deleted file mode 100755 index 14ebbe2..0000000 --- a/sys-kernel/pinephone-sources/files/dts-pinephone-drop-modem-power-node.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 5da6a7e3f4d6e11f4887893672f849d2d4fa5b58 Mon Sep 17 00:00:00 2001 -From: Clayton Craft -Date: Wed, 16 Dec 2020 20:16:14 -0800 -Subject: [PATCH] dts: pinephone: drop modem-power node - ---- - .../allwinner/sun50i-a64-pinephone-1.0.dts | 26 +++--------------- - .../allwinner/sun50i-a64-pinephone-1.1.dts | 27 +++---------------- - .../allwinner/sun50i-a64-pinephone-1.2.dts | 27 +++---------------- - .../dts/allwinner/sun50i-a64-pinephone.dtsi | 12 +++++++++ - 4 files changed, 24 insertions(+), 68 deletions(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts -index 0f6faa44ce3e..2cc513772172 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts -@@ -86,28 +86,6 @@ ®_drivevbus { - status = "okay"; - }; - --&uart3 { -- modem { -- compatible = "quectel,eg25"; -- char-device-name = "modem-power"; -- -- power-supply = <®_vbat_bb>; /* PL7 */ -- -- enable-gpios = <&pio 7 8 GPIO_ACTIVE_LOW>; /* PH8 */ -- reset-gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */ -- pwrkey-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */ -- -- sleep-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */ -- wakeup-gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>; /* PB2-RI */ -- -- cts-gpios = <&pio 3 5 GPIO_ACTIVE_HIGH>; /* PD5-CTS */ -- dtr-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6-DTR */ -- rts-gpios = <&pio 3 4 GPIO_ACTIVE_HIGH>; /* PD4-RTS */ -- -- quectel,qdai = "1,1,0,1,0,0,1,1"; -- }; --}; -- - &usbphy { - usb-role-switch; - -@@ -118,6 +96,10 @@ usb0_drd_sw: endpoint { - }; - }; - -+&ring_indicator { -+ gpios = <&pio 1 2 GPIO_ACTIVE_LOW>; /* PB2 */ -+}; -+ - &sgm3140 { - flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */ - enable-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */ -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts -index 95a880fdc9ce..5f3b6a1a142f 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts -@@ -109,34 +109,15 @@ - status = "okay"; - }; - -+&ring_indicator { -+ gpios = <&pio 1 2 GPIO_ACTIVE_LOW>; /* PB2 */ -+}; -+ - &sgm3140 { - enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */ - flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */ - }; - --&uart3 { -- modem { -- compatible = "quectel,eg25"; -- char-device-name = "modem-power"; -- -- power-supply = <®_vbat_bb>; /* PL7 */ -- -- enable-gpios = <&pio 7 8 GPIO_ACTIVE_LOW>; /* PH8 */ -- reset-gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */ -- pwrkey-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */ -- //status-pwrkey-multiplexed; /* status acts as pwrkey */ -- -- sleep-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */ -- wakeup-gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>; /* PB2-RI */ -- -- dtr-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6-DTR */ -- cts-gpios = <&pio 3 5 GPIO_ACTIVE_HIGH>; /* PD5-CTS */ -- rts-gpios = <&pio 3 4 GPIO_ACTIVE_HIGH>; /* PD4-RTS */ -- -- quectel,qdai = "1,1,0,1,0,0,1,1"; -- }; --}; -- - &usbphy { - usb-role-switch; - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts -index 23ba72508cfc..889841ca5b8a 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts -@@ -101,34 +101,15 @@ - enable-active-high; - }; - -+&ring_indicator { -+ gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */ -+}; -+ - &sgm3140 { - enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */ - flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */ - }; - --&uart3 { -- modem { -- compatible = "quectel,eg25"; -- char-device-name = "modem-power"; -- -- power-supply = <®_vbat_bb>; /* PL7 */ -- -- enable-gpios = <&pio 7 8 GPIO_ACTIVE_LOW>; /* PH8 */ -- reset-gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */ -- status-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */ -- pwrkey-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */ -- -- host-ready-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */ -- wakeup-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6-RI */ -- -- dtr-gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>; /* PB2-DTR */ -- cts-gpios = <&pio 3 5 GPIO_ACTIVE_HIGH>; /* PD5-CTS */ -- rts-gpios = <&pio 3 4 GPIO_ACTIVE_HIGH>; /* PD4-RTS */ -- -- quectel,qdai = "1,1,0,1,0,0,1,1"; -- }; --}; -- - &usbphy { - usb-role-switch; - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -index 02d82980cf39..979d01de8d84 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -@@ -192,6 +192,17 @@ ec25_codec: ec25-codec { - compatible = "quectel,ec25"; - }; - -+ gpio-keys { -+ compatible = "gpio-keys"; -+ -+ ring_indicator: ring-indicator { -+ label = "Ring Indicator"; -+ linux,can-disable; -+ linux,code = ; -+ wakeup-source; -+ }; -+ }; -+ - i2c_csi: i2c-csi { - compatible = "i2c-gpio"; - sda-gpios = <&pio 4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* PE13 */ -@@ -256,6 +267,7 @@ reg_usb_5v: usb-5v { - reg_vbat_bb: vbat-bb { - compatible = "regulator-fixed"; - regulator-name = "vbat-bb"; -+ regulator-always-on; - regulator-min-microvolt = <3500000>; - regulator-max-microvolt = <3500000>; - gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */ --- -2.29.2 - diff --git a/sys-kernel/pinephone-sources/pinephone-sources-5.18.2.ebuild b/sys-kernel/pinephone-sources/pinephone-sources-5.18.6.ebuild similarity index 50% rename from sys-kernel/pinephone-sources/pinephone-sources-5.18.2.ebuild rename to sys-kernel/pinephone-sources/pinephone-sources-5.18.6.ebuild index ddcb442..4f19ba3 100755 --- a/sys-kernel/pinephone-sources/pinephone-sources-5.18.2.ebuild +++ b/sys-kernel/pinephone-sources/pinephone-sources-5.18.6.ebuild @@ -4,8 +4,11 @@ EAPI="8" ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="4" +K_NOUSENAME="yes" +K_NOSETEXTRAVERSION="yes" +K_SECURITY_UNSUPPORTED="1" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="9" inherit kernel-2 detect_version @@ -18,15 +21,24 @@ DEPEND="${RDEPEND} DESCRIPTION="Full sources for the Linux kernel with gentoo patchset and patches for the PinePhone" -MEGI_PATCH_URI="https://xff.cz/kernels/${PV:0:4}/patches/all.patch" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${MEGI_PATCH_URI} -> all-${PV}.patch" +MEGI_TAG="orange-pi-5.18-20220615-1100" +SRC_URI="https://github.com/megous/linux/archive/${MEGI_TAG}.tar.gz ${GENPATCHES_URI}" PATCHES=( - #Megi patch set - ${DISTDIR}/all-${PV}.patch # Drop Megi's Modem-Power - "${FILESDIR}"/dts-pinephone-drop-modem-power-node.patch + "${FILESDIR}"/0101-arm64-dts-pinephone-drop-modem-power-node.patch + "${FILESDIR}"/0102-arm64-dts-pinephone-pro-remove-modem-node.patch + # Reparent clocks to lower speed-occillator + "${FILESDIR}"/0103-ccu-sun50i-a64-reparent-clocks-to-lower-speed-oscillator.patch + # Quirk for Kernel-Bug 210681 + "${FILESDIR}"/0104-quirk-kernel-org-bug-210681-firmware_rome_error.patch + # LED patches + "${FILESDIR}"/0105-leds-gpio-make-max_brightness-configurable.patch + "${FILESDIR}"/0106-panic-led.patch + # Bootsplash + "${FILESDIR}"/0201-revert-fbcon-remove-now-unusued-softback_lines-cursor-argument.patch + "${FILESDIR}"/0202-revert-fbcon-remove-no-op-fbcon_set_origin.patch + "${FILESDIR}"/0203-revert-fbcon-remove-soft-scrollback-code.patch ) src_prepare() {