-
Notifications
You must be signed in to change notification settings - Fork 547
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Disable libudev to avoid dependency. Backport patch to fix 64-bit int types under ppc64 and mips64. Signed-off-by: Rosen Penev <rosenp@gmail.com>
- Loading branch information
1 parent
15f73af
commit 00972ca
Showing
2 changed files
with
47 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
From b5159062f079d451f23d7f2a0e7d9e2f84934f94 Mon Sep 17 00:00:00 2001 | ||
From: Rosen Penev <rosenp@gmail.com> | ||
Date: Sat, 29 Jan 2022 17:09:56 -0800 | ||
Subject: [PATCH] btrfs-progs: fix 64-bit mips and powerpc types | ||
|
||
The kernel uses 'unsigned long' for u64 specifically for ppc64 and | ||
mips64. | ||
|
||
Remove asm/types.h include as it will get included properly later. | ||
|
||
Fixe -Wformat warnings. | ||
|
||
Signed-off-by: Rosen Penev <rosenp@gmail.com> | ||
Signed-off-by: David Sterba <dsterba@suse.com> | ||
--- | ||
cmds/receive-dump.c | 1 - | ||
kerncompat.h | 5 +++++ | ||
2 files changed, 5 insertions(+), 1 deletion(-) | ||
|
||
--- a/cmds/receive-dump.c | ||
+++ b/cmds/receive-dump.c | ||
@@ -31,7 +31,6 @@ | ||
#include <stdlib.h> | ||
#include <time.h> | ||
#include <ctype.h> | ||
-#include <asm/types.h> | ||
#include <uuid/uuid.h> | ||
#include "common/utils.h" | ||
#include "cmds/commands.h" | ||
--- a/kerncompat.h | ||
+++ b/kerncompat.h | ||
@@ -19,6 +19,11 @@ | ||
#ifndef __KERNCOMPAT_H__ | ||
#define __KERNCOMPAT_H__ | ||
|
||
+#ifndef __SANE_USERSPACE_TYPES__ | ||
+/* For PPC64 to get LL64 types */ | ||
+#define __SANE_USERSPACE_TYPES__ | ||
+#endif | ||
+ | ||
#include <stdio.h> | ||
#include <stdlib.h> | ||
#include <errno.h> |
00972ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@neheb @Beginner-Go i've received some errors after compiling btrfs-progs with this commit
can you give me some advice. Thank's.
00972ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you trying to run this on an old kernel?
00972ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is 5.4 kernel old? if yes, then i run this on an old kernel.
00972ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The original commit is for kernel openwrt 22.x, not 21.x. 22.x will be 5.10 only.
00972ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
then what should i do now? reverting this commit on my build or what?
00972ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The 5.4 kernel has the same problem
00972ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess? I have no idea what repository is.
00972ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no problem compiling the previous version,the 5.16.1 compilation error.
00972ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wget -P feeds/packages/utils/btrfs-progs/patches https://github.com/kdave/btrfs-progs/commit/431dc7021c43e43658af436208182f8680e15fe2.patch
00972ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/WYC-2020/packages/commit/74b200f20a1a6161b120be383b766e7b0ab1bdec