Skip to contentSkip to conversation

Misc patches

PATCH Superseded Wei Liu 4 participants 14 messages May 13, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Wei Liu

author
#0 lore raw

cover Misc patches

Wei Liu (4):
gitignore: ignore .vscode directory
public/tmem.h: fix version number in comment
README: document that python is required
INSTALL: remove duplicate sentence

 .gitignore                | 1 +
 INSTALL                   | 1 -
 README                    | 4 ++++
 xen/include/public/tmem.h | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)
Signature · 7 lines
2.20.1


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
author
#1 lore raw

PATCH 1/4 gitignore: ignore .vscode directory

The directory is created by Visual Studio Code editor to store its local state.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
.gitignore +1 -0
index 26bc583f74..3822bb75ba 100644
@@ -30,6 +30,7 @@ cscope.out
 cscope.po.out
 .config
 .vimrc
+.vscode
 
 dist
 stubdom/*.tar.gz
Signature · 7 lines
2.20.1


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#2 lore raw

Re: [PATCH 1/4] gitignore: ignore .vscode directory

Quoted 13 lines · Wei Liu

The directory is created by Visual Studio Code editor to store its local state.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
.gitignore +0 -0
index 26bc583f74..3822bb75ba 100644

.gitignore cscope.out · line 33

Quoted 4 lines
.gitignore +1 -0
@@ -30,6 +30,7 @@ cscope.out
 cscope.po.out
 .config
 .vimrc
+.vscode

Shouldn't this go in "~/.config/git/ignore" instead? Or whatever git config core.excludesFile point to.

git help ignore for more detail.

Signature · 6 lines
Anthony PERARD

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
author
#3 lore raw

Re: [PATCH 1/4] gitignore: ignore .vscode directory

Quoted 22 lines · Anthony PERARD
Quoted 13 lines · Wei Liu

The directory is created by Visual Studio Code editor to store its local state.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
.gitignore +0 -0
index 26bc583f74..3822bb75ba 100644

.gitignore cscope.out · line 33

Quoted 4 lines
.gitignore +1 -0
@@ -30,6 +30,7 @@ cscope.out
 cscope.po.out
 .config
 .vimrc
+.vscode

Shouldn't this go in "~/.config/git/ignore" instead? Or whatever git config core.excludesFile point to.

Quoted 1 line

git help ignore for more detail.

We already put a bunch of files for various tools in xen.git's gitignore. I don't see why this can't be done for vscode.

Wei.

Quoted 3 lines
Signature · 2 lines
-- 
Anthony PERARD

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

author
#4 lore raw

PATCH 2/4 public/tmem.h: fix version number in comment

In reply to Wei Liu

The version number has been changed above due to rebasing onto 4.13 branch, but the one in the matching comment was left unchanged.

---
 xen/include/public/tmem.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
xen/include/public/tmem.h +1 -1
index d9b1c266f6..362ba45d5a 100644
@@ -107,7 +107,7 @@ typedef struct tmem_op tmem_op_t;
 DEFINE_XEN_GUEST_HANDLE(tmem_op_t);
 #endif
 
-#endif  /* __XEN_INTERFACE_VERSION__ < 0x00041200 */
+#endif  /* __XEN_INTERFACE_VERSION__ < 0x00041300 */
 
 #endif /* __XEN_PUBLIC_TMEM_H__ */
 
Signature · 7 lines
2.20.1


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Reviewed-by on v1 2/4
#5 lore raw

Re: [PATCH 2/4] public/tmem.h: fix version number in comment

Quoted 5 lines
Quoted 1 line
Quoted 1 line · On 13.05.19 at 15:47, <[email protected]> wrote:

The version number has been changed above due to rebasing onto 4.13 branch, but the one in the matching comment was left unchanged.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

author
#6 lore raw

PATCH 3/4 README: document that `python` is required

In reply to Wei Liu

The hypervisor build system requires python. To avoid putting too much (confusing) information in README, mandate availability of python.

---
 README | 4 ++++
 1 file changed, 4 insertions(+)
README +4 -0
index 23e4f7c3dc..a60ccf6e9c 100644
@@ -181,6 +181,10 @@ Various tools, such as pygrub, have the following runtime dependencies:
           URL:    http://www.python.org/
           Debian: python
 
+Note that the build system expects `python` to be available. If your system
+only has `python2` or `python3` but not `python` (as in Linux From Scratch),
+you will need to create a symlink for it.
+
 Intel(R) Trusted Execution Technology Support
 =============================================
 
Signature · 7 lines
2.20.1


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#7 lore raw

Re: [PATCH 3/4] README: document that `python` is required

README Various tools, such as pygrub, have the following runtime dependencies: · line 186

Quoted 10 lines
Quoted 1 line
Quoted 1 line · On 13.05.19 at 15:47, <[email protected]> wrote:
README +3 -0
@@ -181,6 +181,10 @@ Various tools, such as pygrub, have the following runtime dependencies:
           URL:    http://www.python.org/ 
           Debian: python
 
+Note that the build system expects `python` to be available. If your system
+only has `python2` or `python3` but not `python` (as in Linux From Scratch),
+you will need to create a symlink for it.

Is creating a symlink indeed the only option? What about specifying PYTHON= on the make cmdline? I don't mean to say the set of workarounds needs to be exhaustive here, but perhaps add at least "e.g." if there are other options as well?

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

author
#8 lore raw

Re: [PATCH 3/4] README: document that `python` is required

Quoted 7 lines · Jan Beulich
Quoted 7 lines
Quoted 1 line
Quoted 1 line · On 13.05.19 at 15:47, <[email protected]> wrote:
README +0 -0
@@ -181,6 +181,10 @@ Various tools, such as pygrub, have the following runtime dependencies:
           URL:    http://www.python.org/ 
           Debian: python
 
Quoted 8 lines

README Various tools, such as pygrub, have the following runtime dependencies: · line 186

Quoted 3 lines
README +3 -0
+Note that the build system expects `python` to be available. If your system
+only has `python2` or `python3` but not `python` (as in Linux From Scratch),
+you will need to create a symlink for it.

Is creating a symlink indeed the only option? What about specifying PYTHON= on the make cmdline? I don't mean to say the set of workarounds needs to be exhaustive here, but perhaps add at least "e.g." if there are other options as well?

Xen's build system is strange in that

make A=B

is not the same as

A=B make

.

In practice this has bitten a few people in the past. That's why I opted to not mention that variant.

But since you ask, I can add it to next version.

Wei.

Quoted 4 lines

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#9 lore raw

Re: [PATCH 3/4] README: document that `python` is required

In reply to Wei Liu
Quoted 14 lines · Wei Liu

The hypervisor build system requires python. To avoid putting too much (confusing) information in README, mandate availability of python.

---
 README | 4 ++++
 1 file changed, 4 insertions(+)
README +0 -0
index 23e4f7c3dc..a60ccf6e9c 100644

README Various tools, such as pygrub, have the following runtime dependencies: · line 186

Quoted 6 lines
README +3 -0
@@ -181,6 +181,10 @@ Various tools, such as pygrub, have the following runtime dependencies:
           URL:    http://www.python.org/
           Debian: python
 
+Note that the build system expects `python` to be available. If your system
+only has `python2` or `python3` but not `python` (as in Linux From Scratch),
+you will need to create a symlink for it.

Since we're not in a release crunch any more, it seems like updating ./configure to look for ""python3", "python2", and "python" (probably in that order) would be a better solution here.

-George

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

author
#10 lore raw

Re: [PATCH 3/4] README: document that `python` is required

Quoted 18 lines · George Dunlap
Quoted 17 lines · Wei Liu

The hypervisor build system requires python. To avoid putting too much (confusing) information in README, mandate availability of python.

---
 README | 4 ++++
 1 file changed, 4 insertions(+)
README +0 -0
index 23e4f7c3dc..a60ccf6e9c 100644
@@ -181,6 +181,10 @@ Various tools, such as pygrub, have the following runtime dependencies:
           URL:    http://www.python.org/
           Debian: python
 
Quoted 7 lines

README Various tools, such as pygrub, have the following runtime dependencies: · line 186

Quoted 3 lines
README +3 -0
+Note that the build system expects `python` to be available. If your system
+only has `python2` or `python3` but not `python` (as in Linux From Scratch),
+you will need to create a symlink for it.

Since we're not in a release crunch any more, it seems like updating ./configure to look for ""python3", "python2", and "python" (probably in that order) would be a better solution here.

No, it is not about tools build. Hypervisor build depends on python but we don't want it to depend on configure.

See "Hypervisor build can't work without python (Was: Re: Xen commit 9b0bc91b3 possibly removed too much info from README)"

Wei.

Quoted 2 lines

-George

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

author
#11 lore raw

PATCH 4/4 INSTALL: remove duplicate sentence

In reply to Wei Liu

The same sentence is repeated in the next paragraph.

---
 INSTALL | 1 -
 1 file changed, 1 deletion(-)
INSTALL +0 -1
index 9aa9ebdddc..1665ddd6a4 100644
@@ -225,7 +225,6 @@ XEN_BUILD_TIME=hh:mm:ss
 SMBIOS_REL_DATE=mm/dd/yyyy
 VGABIOS_REL_DATE="dd Mon yyyy"
 
-During tools build external repos will be cloned into the source tree.
 This variable can be used to point to a different git binary to be used.
 GIT=
 
Signature · 7 lines
2.20.1


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#12 lore raw

Re: [PATCH 4/4] INSTALL: remove duplicate sentence

INSTALL XEN_BUILD_TIME=hh:mm:ss · line 229

Quoted 10 lines
Quoted 1 line
Quoted 1 line · On 13.05.19 at 15:47, <[email protected]> wrote:
INSTALL +0 -1
@@ -225,7 +225,6 @@ XEN_BUILD_TIME=hh:mm:ss
 SMBIOS_REL_DATE=mm/dd/yyyy
 VGABIOS_REL_DATE="dd Mon yyyy"
 
-During tools build external repos will be cloned into the source tree.
 This variable can be used to point to a different git binary to be used.
 GIT=

To me it would seem more logical to delete the other, later instance of the sentence. You wouldn't need $(GIT) if there was no cloning.

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

author
#13 lore raw

Re: [PATCH 4/4] INSTALL: remove duplicate sentence

Quoted 7 lines · Jan Beulich
Quoted 7 lines
Quoted 1 line
Quoted 1 line · On 13.05.19 at 15:47, <[email protected]> wrote:
INSTALL +0 -0
@@ -225,7 +225,6 @@ XEN_BUILD_TIME=hh:mm:ss
 SMBIOS_REL_DATE=mm/dd/yyyy
 VGABIOS_REL_DATE="dd Mon yyyy"
 
Quoted 7 lines

INSTALL XEN_BUILD_TIME=hh:mm:ss · line 229

Quoted 3 lines
INSTALL +0 -1
-During tools build external repos will be cloned into the source tree.
 This variable can be used to point to a different git binary to be used.
 GIT=

To me it would seem more logical to delete the other, later instance of the sentence. You wouldn't need $(GIT) if there was no cloning.

But deleting that one would be wrong -- it would make that paragraph seems to be only about stubdom, while in fact most of those envars are about tools build.

Wei.

Quoted 4 lines

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel