search

parinzee / linux-surface-overlay

Gentoo Overlay with surface kernel and other utilities from linux-surface repo.
https://Parinz.github.io/linux-surface-overlay
BSD 3-Clause "New" or "Revised" License
27 stars 3 forks source link

[BUG] Failed to emerge sys-kernel/surface-sources-5.15.3 #7

Open uzuki314 opened 2 years ago

uzuki314 commented 2 years ago

Describe the bug I think I'm having a similar problem when I emerge --ask sys-kernel/surface-sources

I'm currently using surface-sources-5.13.13 and my device is surface book 2 (i7-8650u+GTX1060).

To Reproduce emerge --ask sys-kernel/surface-sources

Expected behavior

 * ERROR: sys-kernel/surface-sources-5.15.3::linux-surface failed (prepare phase):
 *   patch -p1  failed with /tmp/portage/sys-kernel/surface-sources-5.15.3/files/5.15/0010-cameras.patch
 *
 * Call stack:
 *               ebuild.sh, line  127:  Called src_prepare
 *             environment, line 1812:  Called eapply '/tmp/portage/sys-kernel/surface-sources-5.15.3/files/5.15/0010-cameras.patch'
 *             environment, line  687:  Called _eapply_patch '/tmp/portage/sys-kernel/surface-sources-5.15.3/files/5.15/0010-cameras.patch'
 *             environment, line  625:  Called __helpers_die 'patch -p1  failed with /tmp/portage/sys-kernel/surface-sources-5.15.3/files/5.15/0010-cameras.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *          die "$@"

Additional context complete build log 

 * Package:    sys-kernel/surface-sources-5.15.3
 * Repository: linux-surface
 * USE:        abi_x86_64 amd64 elibc_glibc kernel_linux userland_GNU
 * FEATURES:   network-sandbox preserve-libs sandbox userpriv usersandbox
 * 
 * surface-sources is *not* supported by the Gentoo Kernel Project in any way.
 * If you need support, please contact the overlay developers directly.
 * Do *not* open bugs in Gentoo's bugzilla unless you have issues with
 * the ebuilds. Thank you.
 * 
 * Excluding Patch #5010_enable-additional-cpu-optimizations-for-gcc.patch ...
 [ ok ]
 * Excluding Patch #5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch ...
 [ ok ]
 * Excluding Patch #5011_enable-cpu-optimizations-for-gcc8.patch ...
 [ ok ]
 * Excluding Patch #5012_enable-cpu-optimizations-for-gcc91.patch ...
 [ ok ]
 * Excluding Patch #5013_enable-cpu-optimizations-for-gcc10.patch ...
 [ ok ]
 * Excluding Patch #5010_enable-additional-cpu-optimizations-for-gcc.patch ...
 [ ok ]
 * Excluding Patch #5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch ...
 [ ok ]
 * Excluding Patch #5011_enable-cpu-optimizations-for-gcc8.patch ...
 [ ok ]
 * Excluding Patch #5012_enable-cpu-optimizations-for-gcc91.patch ...
 [ ok ]
 * Excluding Patch #5013_enable-cpu-optimizations-for-gcc10.patch ...
 [ ok ]
 * Applying 1000_linux-5.15.1.patch (-p1) ...
 [ ok ]
 * Applying 1001_linux-5.15.2.patch (-p1) ...
 [ ok ]
 * Applying 1002_linux-5.15.3.patch (-p1) ...
 [ ok ]
 * Applying 1500_XATTR_USER_PREFIX.patch (-p1) ...
 [ ok ]
 * Applying 1510_fs-enable-link-security-restrictions-by-default.patch (-p1) ...
 [ ok ]
 * Applying 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch (-p1) ...
 [ ok ]
 * Applying 2900_tmp513-Fix-build-issue-by-selecting-CONFIG_REG.patch (-p1) ...
 [ ok ]
 * Applying 2920_sign-file-patch-for-libressl.patch (-p1) ...
 [ ok ]
 * Applying 3000_Support-printing-firmware-info.patch (-p1) ...
 [ ok ]
 * Applying 4567_distro-Gentoo-Kconfig.patch (-p1) ...
 [ ok ]
 * Applying 0001-surface3-oemb.patch ...
 [ ok ]
 * Applying 0002-mwifiex.patch ...
patching file drivers/net/wireless/marvell/mwifiex/pcie.c
patching file drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
patching file drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
patching file drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
patching file drivers/net/wireless/marvell/mwifiex/pcie.c
patching file drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
patching file drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
patching file drivers/net/wireless/marvell/mwifiex/pcie.c
patching file drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
patching file drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
patching file drivers/bluetooth/btusb.c
Hunk #3 succeeded at 3815 (offset -4 lines).
patching file drivers/net/wireless/marvell/mwifiex/cfg80211.c
patching file drivers/net/wireless/marvell/mwifiex/pcie.c
patching file drivers/net/wireless/marvell/mwifiex/cfg80211.c
patching file drivers/net/wireless/marvell/mwifiex/cfg80211.c
patching file drivers/net/wireless/marvell/mwifiex/cfg80211.c
patching file drivers/net/wireless/marvell/mwifiex/cfg80211.c
patching file drivers/net/wireless/marvell/mwifiex/cfg80211.c
patching file drivers/net/wireless/marvell/mwifiex/cfg80211.c
patching file drivers/net/wireless/marvell/mwifiex/cmdevt.c
patching file drivers/net/wireless/marvell/mwifiex/main.c
patching file drivers/net/wireless/marvell/mwifiex/main.h
patching file drivers/net/wireless/marvell/mwifiex/sta_cmd.c
patching file drivers/net/wireless/marvell/mwifiex/main.c
patching file drivers/net/wireless/marvell/mwifiex/main.h
patching file drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
patching file drivers/net/wireless/marvell/mwifiex/cfg80211.c
patching file drivers/net/wireless/marvell/mwifiex/cfg80211.c
patching file drivers/net/wireless/marvell/mwifiex/11n.c
patching file drivers/net/wireless/marvell/mwifiex/sta_event.c
 [ ok ]
 * Applying 0003-ath10k.patch ...
 [ ok ]
 * Applying 0004-ipts.patch ...
 [ ok ]
 * Applying 0005-surface-sam.patch ...
patching file drivers/platform/surface/surface_aggregator_registry.c
patching file drivers/platform/surface/aggregator/bus.c
patching file drivers/platform/surface/aggregator/bus.h
patching file drivers/platform/surface/aggregator/core.c
patching file include/linux/surface_aggregator/device.h
patching file drivers/platform/surface/surface_aggregator_registry.c
patching file drivers/platform/surface/surface_aggregator_registry.c
patching file drivers/platform/surface/aggregator/bus.c
patching file include/linux/surface_aggregator/device.h
patching file Documentation/driver-api/surface_aggregator/client.rst
patching file drivers/platform/surface/aggregator/controller.c
patching file include/linux/surface_aggregator/controller.h
patching file include/linux/surface_aggregator/device.h
patching file drivers/platform/surface/surface_aggregator_registry.c
patching file drivers/power/supply/surface_charger.c
patching file drivers/power/supply/surface_battery.c
patching file drivers/hid/surface-hid/surface_hid_core.c
patching file include/linux/surface_aggregator/serial_hub.h
patching file drivers/platform/surface/surface_aggregator_registry.c
patching file drivers/platform/surface/surface_aggregator_registry.c
patching file MAINTAINERS
patching file drivers/platform/surface/Kconfig
patching file drivers/platform/surface/Makefile
patching file drivers/platform/surface/surface_kip_tablet_switch.c
patching file drivers/platform/surface/surface_aggregator_registry.c
 [ ok ]
 * Applying 0006-surface-sam-over-hid.patch ...
 [ ok ]
 * Applying 0007-surface-gpe.patch ...
 [ ok ]
 * Applying 0008-surface-button.patch ...
 [ ok ]
 * Applying 0009-surface-typecover.patch ...
 [ ok ]
 * Applying 0010-cameras.patch ...
patching file drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
patching file MAINTAINERS
patching file drivers/media/i2c/Kconfig
patching file drivers/media/i2c/Makefile
patching file drivers/media/i2c/ov5693.c
patching file drivers/media/pci/intel/ipu3/cio2-bridge.c
patching file drivers/media/pci/intel/ipu3/cio2-bridge.h
patching file drivers/media/pci/intel/ipu3/cio2-bridge.c
patching file drivers/media/pci/intel/ipu3/cio2-bridge.h
patching file drivers/media/pci/intel/ipu3/cio2-bridge.h
patching file drivers/media/i2c/ov5693.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/pci/intel/ipu3/cio2-bridge.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/acpi/scan.c
patching file include/acpi/acpi_bus.h
patching file drivers/i2c/i2c-core-acpi.c
patching file include/linux/platform_data/tps68470.h
patching file drivers/regulator/Kconfig
patching file drivers/regulator/Makefile
patching file drivers/regulator/tps68470-regulator.c
patching file drivers/clk/Kconfig
patching file drivers/clk/Makefile
patching file drivers/clk/clk-tps68470.c
patching file include/linux/mfd/tps68470.h
patching file drivers/platform/x86/intel/int3472/intel_skl_int3472_tps68470.c
patching file drivers/platform/x86/intel/int3472/Makefile
patching file drivers/platform/x86/intel/int3472/clk_and_regulator.c (renamed from drivers/platform/x86/intel/int3472/intel_skl_int3472_clk_and_regulator.c)
patching file drivers/platform/x86/intel/int3472/common.c
patching file drivers/platform/x86/intel/int3472/common.h (renamed from drivers/platform/x86/intel/int3472/intel_skl_int3472_common.h)
patching file drivers/platform/x86/intel/int3472/discrete.c (renamed from drivers/platform/x86/intel/int3472/intel_skl_int3472_discrete.c)
patching file drivers/platform/x86/intel/int3472/tps68470.c (renamed from drivers/platform/x86/intel/int3472/intel_skl_int3472_tps68470.c)
Hunk #2 succeeded at 95 (offset -7 lines).
Hunk #3 succeeded at 135 (offset -7 lines).
patching file drivers/platform/x86/intel/int3472/common.c
can't find file to patch at input line 4668
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/drivers/platform/x86/intel/int3472/common.h b/drivers/platform/x86/intel/int3472/common.h
|index d14944ee8586..53270d19c73a 100644
|--- a/drivers/platform/x86/intel/int3472/common.h
|+++ b/drivers/platform/x86/intel/int3472/common.h
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 4682
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
|index a19a1f5dbdd7..efd31a0c7a88 100644
|--- a/drivers/platform/x86/intel/int3472/discrete.c
|+++ b/drivers/platform/x86/intel/int3472/discrete.c
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 4740
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|2.34.1
|
|From c2c331a5b417f82997b886919e334957b98ff44a Mon Sep 17 00:00:00 2001
|From: Hans de Goede <hdegoede@redhat.com>
|Date: Sun, 10 Oct 2021 20:57:05 +0200
|Subject: [PATCH] platform/x86: int3472: Pass tps68470_clk_platform_data to the
| tps68470-regulator MFD-cell
|
|Pass tps68470_clk_platform_data to the tps68470-clk MFD-cell,
|so that sensors which use the TPS68470 can find their clock.
|
|Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|Patchset: cameras
|---
| drivers/platform/x86/intel/int3472/tps68470.c | 33 ++++++++++++++-----
| 1 file changed, 25 insertions(+), 8 deletions(-)
|
|diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
|index b94cf66ab61f..78e34e7b6969 100644
|--- a/drivers/platform/x86/intel/int3472/tps68470.c
|+++ b/drivers/platform/x86/intel/int3472/tps68470.c
--------------------------
No file to patch.  Skipping patch.
4 out of 4 hunks ignored
patching file drivers/platform/x86/intel/int3472/Makefile
patching file drivers/platform/x86/intel/int3472/tps68470.c
Hunk #1 succeeded at 8 (offset -1 lines).
Hunk #2 FAILED at 101.
Hunk #3 FAILED at 129.
Hunk #4 FAILED at 137.
Hunk #5 FAILED at 144.
Hunk #6 succeeded at 137 (offset -24 lines).
4 out of 6 hunks FAILED -- saving rejects to file drivers/platform/x86/intel/int3472/tps68470.c.rej
patching file drivers/platform/x86/intel/int3472/tps68470.h
patching file drivers/platform/x86/intel/int3472/tps68470_board_data.c
patching file drivers/platform/x86/intel/int3472/discrete.c
Hunk #1 succeeded at 182 with fuzz 1 (offset -198 lines).
patching file drivers/platform/x86/intel/int3472/tps68470.c
Hunk #1 succeeded at 134 (offset -39 lines).
Hunk #2 succeeded at 173 (offset -39 lines).
patching file drivers/media/i2c/ov8865.c
patching file drivers/media/i2c/ov8865.c
patching file drivers/mfd/intel-lpss-pci.c
patching file drivers/mfd/intel-lpss.c
patching file drivers/mfd/intel-lpss.h
patching file drivers/platform/x86/intel/int3472/tps68470_board_data.c
 [ !! ]
 * ERROR: sys-kernel/surface-sources-5.15.3::linux-surface failed (prepare phase):
 *   patch -p1  failed with /tmp/portage/sys-kernel/surface-sources-5.15.3/files/5.15/0010-cameras.patch
 * 
 * Call stack:
 *               ebuild.sh, line  127:  Called src_prepare
 *             environment, line 1812:  Called eapply '/tmp/portage/sys-kernel/surface-sources-5.15.3/files/5.15/0010-cameras.patch'
 *             environment, line  687:  Called _eapply_patch '/tmp/portage/sys-kernel/surface-sources-5.15.3/files/5.15/0010-cameras.patch'
 *             environment, line  625:  Called __helpers_die 'patch -p1  failed with /tmp/portage/sys-kernel/surface-sources-5.15.3/files/5.15/0010-cameras.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *          die "$@"
 * 
 * If you need support, post the output of `emerge --info '=sys-kernel/surface-sources-5.15.3::linux-surface'`,
 * the complete build log and the output of `emerge -pqv '=sys-kernel/surface-sources-5.15.3::linux-surface'`.
 * The complete build log is located at '/tmp/portage/sys-kernel/surface-sources-5.15.3/temp/build.log'.
 * The ebuild environment file is located at '/tmp/portage/sys-kernel/surface-sources-5.15.3/temp/environment'.
 * Working directory: '/tmp/portage/sys-kernel/surface-sources-5.15.3/work/linux-5.15.3-surface'
 * S: '/tmp/portage/sys-kernel/surface-sources-5.15.3/work/linux-5.15.3-surface'
parinzee commented 2 years ago

I'm very sorry. I've been quite busy lately and have not have enough time to work this project.

Regardless, I believe that you are emerging version 5.15.3 and not 5.13.13. The latter (5.13.13) is currently the latest version that is working. Perhaps try making sure that you have typed the following into /etc/portage/package.mask

>sys-kernel/surface-sources-5.13.13

I hope this fixes your problem.

Sincerely, Parin