WhyCan Forum(哇酷开发者社区)

XIVN1987

会员

注册时间： 2019-08-30

已发帖子： 250

积分： 311.5

host-fakeroot patch出错，哪位大神知道怎么解决，，谢谢

编译命令如下：

git clone https://github.com/buildroot/buildroot.git
git clone https://github.com/flatmax/buildroot.rockchip.git

cd buildroot
make BR2_EXTERNAL=../buildroot.rockchip rockpis_defconfig

make menuconfig
# Toolchain 下 GCC compiler Version 由 gcc 10.x 改为 gcc 9.x

make

报错信息如下：

fakeroot_1.25.3.orig.tar.gz: OK (sha256: 8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c)
>>> host-fakeroot 1.25.3 Extracting
gzip -d -c /root/buildroot.dl/fakeroot/fakeroot_1.25.3.orig.tar.gz | tar --strip-components=1 -C /root/buildroot/output/build/host-fakeroot-1.25.3   -xf -
>>> host-fakeroot 1.25.3 Patching

Applying 0001-skip-doc-subdirs.patch using patch:
patching file doc/Makefile.am

Applying 0002-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch using patch:
patching file libfakeroot.c

Applying 0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch using patch:
patching file libfakeroot.c

Applying 0004-configure.ac-fix-__xmknod-at-pointer-argument.patch using patch:
patching file configure.ac

Applying 0005-fix-build-regression-on-macOS.patch using patch:
patching file configure.ac
patching file libfakeroot.c

Applying 0002.stat_ver.patch using patch:
patching file libfakeroot.c
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file libfakeroot.c.rej
patching file libfakeroot.c
Hunk #1 succeeded at 1402 with fuzz 1 (offset 50 lines).
patching file libfakeroot.c
Hunk #1 succeeded at 2575 (offset 50 lines).
patching file configure.ac
Reversed (or previously applied) patch detected!  Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file configure.ac.rej
patching file libfakeroot.c
Hunk #1 succeeded at 2116 (offset 50 lines).
Hunk #2 succeeded at 2135 (offset 50 lines).
patching file configure.ac
patching file libfakeroot.c
Hunk #4 succeeded at 2035 (offset 50 lines).
Hunk #5 succeeded at 2636 (offset 50 lines).
patching file wrapawk_macosx
patching file wrapfunc.inp
make: *** [package/pkg-generic.mk:227: /root/buildroot/output/build/host-fakeroot-1.25.3/.stamp_patched] Error 1

XIVN1987

会员

注册时间： 2019-08-30

已发帖子： 250

积分： 311.5

Re: host-fakeroot patch出错，哪位大神知道怎么解决，，谢谢

大概搞清楚了，，

buildroot/package/fakeroot/0002-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
和
buildroot.rockchip/patches.rockpis/fakeroot/0002.stat_ver.patch

中都有如下内容：

diff --git a/libfakeroot.c b/libfakeroot.c
index 3e80e38..14cdbc4 100644
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -90,6 +90,16 @@
 #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
 #endif
 
+#ifndef _STAT_VER
+ #if defined (__aarch64__)
+  #define _STAT_VER 0
+ #elif defined (__x86_64__)
+  #define _STAT_VER 1
+ #else
+  #define _STAT_VER 3
+ #endif
+#endif
+

对同一位置完全相同的补丁，前一个打上，后一个肯定就打不上了，，删掉其中一个补丁就可以了