* [PATCH v2] scripts/git.orderfile: Display meson files along with buildsys ones
@ 2020-09-07 16:12 Philippe Mathieu-Daudé
2020-09-08 9:17 ` Stefano Garzarella
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-07 16:12 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Marc-André Lureau, Philippe Mathieu-Daudé,
Paolo Bonzini
Since commit a56650518f5 ("configure: integrate Meson in the build
system") we replaced many Makefile by Meson files. Adapt the
git.orderfile script to display the new file at the same position.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
scripts/git.orderfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/git.orderfile b/scripts/git.orderfile
index 73fd818d7f3..a021afc2d51 100644
--- a/scripts/git.orderfile
+++ b/scripts/git.orderfile
@@ -18,6 +18,7 @@ docs/*
configure
Makefile*
*.mak
+meson.build
# qapi schema
qapi/*.json
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2] scripts/git.orderfile: Display meson files along with buildsys ones
2020-09-07 16:12 [PATCH v2] scripts/git.orderfile: Display meson files along with buildsys ones Philippe Mathieu-Daudé
@ 2020-09-08 9:17 ` Stefano Garzarella
2020-09-08 10:02 ` Laszlo Ersek
2020-09-16 9:17 ` Laurent Vivier
2 siblings, 0 replies; 7+ messages in thread
From: Stefano Garzarella @ 2020-09-08 9:17 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-trivial, Marc-André Lureau, qemu-devel, Paolo Bonzini
On Mon, Sep 07, 2020 at 06:12:22PM +0200, Philippe Mathieu-Daudé wrote:
> Since commit a56650518f5 ("configure: integrate Meson in the build
> system") we replaced many Makefile by Meson files. Adapt the
> git.orderfile script to display the new file at the same position.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> scripts/git.orderfile | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/scripts/git.orderfile b/scripts/git.orderfile
> index 73fd818d7f3..a021afc2d51 100644
> --- a/scripts/git.orderfile
> +++ b/scripts/git.orderfile
> @@ -18,6 +18,7 @@ docs/*
> configure
> Makefile*
> *.mak
> +meson.build
>
> # qapi schema
> qapi/*.json
> --
> 2.26.2
>
>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] scripts/git.orderfile: Display meson files along with buildsys ones
2020-09-07 16:12 [PATCH v2] scripts/git.orderfile: Display meson files along with buildsys ones Philippe Mathieu-Daudé
2020-09-08 9:17 ` Stefano Garzarella
@ 2020-09-08 10:02 ` Laszlo Ersek
2020-09-08 11:48 ` Paolo Bonzini
2020-09-16 9:17 ` Laurent Vivier
2 siblings, 1 reply; 7+ messages in thread
From: Laszlo Ersek @ 2020-09-08 10:02 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Marc-André Lureau, Paolo Bonzini
On 09/07/20 18:12, Philippe Mathieu-Daudé wrote:
> Since commit a56650518f5 ("configure: integrate Meson in the build
> system") we replaced many Makefile by Meson files. Adapt the
> git.orderfile script to display the new file at the same position.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> scripts/git.orderfile | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/scripts/git.orderfile b/scripts/git.orderfile
> index 73fd818d7f3..a021afc2d51 100644
> --- a/scripts/git.orderfile
> +++ b/scripts/git.orderfile
> @@ -18,6 +18,7 @@ docs/*
> configure
> Makefile*
> *.mak
> +meson.build
>
> # qapi schema
> qapi/*.json
>
Possibly related (not sure if there's another patch pending for it
already): if you run a "make clean" in the source tree, and have the
Meson submodule initialized, the "make clean" will delete files from the
Meson submodule.
find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \
"*.d" matches various meson files.
(Again, apologies if this is already known; I understand this is
probably the worst context to report his in...)
Thanks
Laszlo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] scripts/git.orderfile: Display meson files along with buildsys ones
2020-09-08 10:02 ` Laszlo Ersek
@ 2020-09-08 11:48 ` Paolo Bonzini
2020-09-08 12:30 ` Laszlo Ersek
0 siblings, 1 reply; 7+ messages in thread
From: Paolo Bonzini @ 2020-09-08 11:48 UTC (permalink / raw)
To: Laszlo Ersek, Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Marc-André Lureau
On 08/09/20 12:02, Laszlo Ersek wrote:
> Possibly related (not sure if there's another patch pending for it
> already): if you run a "make clean" in the source tree, and have the
> Meson submodule initialized, the "make clean" will delete files from the
> Meson submodule.
>
> find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \
>
> "*.d" matches various meson files.
>
> (Again, apologies if this is already known; I understand this is
> probably the worst context to report his in...)
Is this running "make clean" from an old commit (i.e. as in an in-tree
build) after having checked out the meson submodule?
Paolo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] scripts/git.orderfile: Display meson files along with buildsys ones
2020-09-08 11:48 ` Paolo Bonzini
@ 2020-09-08 12:30 ` Laszlo Ersek
2020-09-12 6:01 ` Paolo Bonzini
0 siblings, 1 reply; 7+ messages in thread
From: Laszlo Ersek @ 2020-09-08 12:30 UTC (permalink / raw)
To: Paolo Bonzini, Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Marc-André Lureau
On 09/08/20 13:48, Paolo Bonzini wrote:
> On 08/09/20 12:02, Laszlo Ersek wrote:
>> Possibly related (not sure if there's another patch pending for it
>> already): if you run a "make clean" in the source tree, and have the
>> Meson submodule initialized, the "make clean" will delete files from the
>> Meson submodule.
>>
>> find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \
>>
>> "*.d" matches various meson files.
>>
>> (Again, apologies if this is already known; I understand this is
>> probably the worst context to report his in...)
>
> Is this running "make clean" from an old commit (i.e. as in an in-tree
> build) after having checked out the meson submodule?
The source tree is checked out at commit 9d5589bb3fee ("Merge
remote-tracking branch
'remotes/vivier2/tags/linux-user-for-5.2-pull-request' into staging",
2020-09-07).
The current working directory is the source tree.
The working directory is pristine, as in:
$ git reset --hard
$ git clean -ffdx
$ git submodule deinit --force --all
Then:
$ git submodule update --init --force
$ make clean
$ git status
> On branch master
> Your branch is up to date with 'origin/master'.
>
> Changes not staged for commit:
> (use "git add <file>..." to update what will be committed)
> (use "git checkout -- <file>..." to discard changes in working > directory)
> (commit or discard the untracked or modified content in submodules)
>
> modified: meson (modified content)
>
> no changes added to commit (use "git add" and/or "git commit -a")
And if I change to meson:
$ cd meson
$ git status
> HEAD detached at 68ed748f84f1
> Changes not staged for commit:
> (use "git add/rm <file>..." to update what will be committed)
> (use "git checkout -- <file>..." to discard changes in working directory)
>
> deleted: test cases/d/1 simple/app.d
> deleted: test cases/d/1 simple/utils.d
> deleted: test cases/d/10 d cpp/dmain.d
> deleted: test cases/d/10 d cpp/libfile.d
> deleted: test cases/d/11 dub/test.d
> deleted: test cases/d/2 static library/app.d
> deleted: test cases/d/2 static library/libstuff.d
> deleted: test cases/d/3 shared library/app.d
> deleted: test cases/d/3 shared library/libstuff.d
> deleted: test cases/d/3 shared library/sub/libstuff.d
> deleted: test cases/d/4 library versions/lib.d
> deleted: test cases/d/5 mixed/app.d
> deleted: test cases/d/6 unittest/app.d
> deleted: test cases/d/6 unittest/second_unit.d
> deleted: test cases/d/7 multilib/app.d
> deleted: test cases/d/7 multilib/say1.d
> deleted: test cases/d/7 multilib/say2.d
> deleted: test cases/d/9 features/app.d
> deleted: test cases/d/9 features/extra.d
>
> no changes added to commit (use "git add" and/or "git commit -a")
I don't know if the "clean" target has any relevance left, in the
top-level Makefile; I've only looked at it now because the command
> find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \
> ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \
> ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
> ! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \
> -exec rm {} +
needed an update (removing the sqlite3.dll exception) for the
edk2-stable202008 update.
Thanks!
Laszlo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] scripts/git.orderfile: Display meson files along with buildsys ones
2020-09-08 12:30 ` Laszlo Ersek
@ 2020-09-12 6:01 ` Paolo Bonzini
0 siblings, 0 replies; 7+ messages in thread
From: Paolo Bonzini @ 2020-09-12 6:01 UTC (permalink / raw)
To: Laszlo Ersek, Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Marc-André Lureau
On 08/09/20 14:30, Laszlo Ersek wrote:
>
> The current working directory is the source tree.
>
> The working directory is pristine, as in:
> $ git reset --hard
> $ git clean -ffdx
> $ git submodule deinit --force --all
>
> Then:
>
> $ git submodule update --init --force
> $ make clean
> $ git status
I see. We should probably rename the Makefile in the source tree, since
it is only meant to be used from the build tree.
Paolo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] scripts/git.orderfile: Display meson files along with buildsys ones
2020-09-07 16:12 [PATCH v2] scripts/git.orderfile: Display meson files along with buildsys ones Philippe Mathieu-Daudé
2020-09-08 9:17 ` Stefano Garzarella
2020-09-08 10:02 ` Laszlo Ersek
@ 2020-09-16 9:17 ` Laurent Vivier
2 siblings, 0 replies; 7+ messages in thread
From: Laurent Vivier @ 2020-09-16 9:17 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Marc-André Lureau, Paolo Bonzini
Le 07/09/2020 à 18:12, Philippe Mathieu-Daudé a écrit :
> Since commit a56650518f5 ("configure: integrate Meson in the build
> system") we replaced many Makefile by Meson files. Adapt the
> git.orderfile script to display the new file at the same position.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> scripts/git.orderfile | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/scripts/git.orderfile b/scripts/git.orderfile
> index 73fd818d7f3..a021afc2d51 100644
> --- a/scripts/git.orderfile
> +++ b/scripts/git.orderfile
> @@ -18,6 +18,7 @@ docs/*
> configure
> Makefile*
> *.mak
> +meson.build
>
> # qapi schema
> qapi/*.json
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-09-16 9:18 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-07 16:12 [PATCH v2] scripts/git.orderfile: Display meson files along with buildsys ones Philippe Mathieu-Daudé
2020-09-08 9:17 ` Stefano Garzarella
2020-09-08 10:02 ` Laszlo Ersek
2020-09-08 11:48 ` Paolo Bonzini
2020-09-08 12:30 ` Laszlo Ersek
2020-09-12 6:01 ` Paolo Bonzini
2020-09-16 9:17 ` Laurent Vivier
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.