Skip to contentSkip to conversation

ninja: Upgrade from 1.7.2 to major release 1.8.2

PATCH In review Alejandro Enedino Hernandez Samaniego 5 participants 11 messages Feb 1, 2018 – Feb 3, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ninja: Upgrade from 1.7.2 to major release 1.8.2

---
 meta/recipes-devtools/ninja/ninja_1.7.2.bb | 30 ------------------------------
 meta/recipes-devtools/ninja/ninja_1.8.2.bb | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 meta/recipes-devtools/ninja/ninja_1.7.2.bb
 create mode 100644 meta/recipes-devtools/ninja/ninja_1.8.2.bb
meta/recipes-devtools/ninja/ninja_1.7.2.bb deleted +0 -30
deleted file mode 100644
index 4d3b272..0000000
@@ -1,30 +0,0 @@
-SUMMARY = "Ninja is a small build system with a focus on speed."
-HOMEPAGE = "http://martine.github.com/ninja/"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e"
-
-DEPENDS = "re2c-native ninja-native"
-
-SRCREV = "717b7b4a31db6027207588c0fb89c3ead384747b"
-
-SRC_URI = "git://github.com/martine/ninja.git;branch=release"
-UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
-
-S = "${WORKDIR}/git"
-
-do_configure[noexec] = "1"
-
-do_compile_class-native() {
-       ./configure.py --bootstrap
-}
-
-do_compile() {
-       ./configure.py
-       ninja
-}
-
-do_install() {
-       install -D -m 0755  ${S}/ninja ${D}${bindir}/ninja
-}
-
-BBCLASSEXTEND = "native nativesdk"
meta/recipes-devtools/ninja/ninja_1.8.2.bb new file +30 -0
new file mode 100644
index 0000000..c6fcfef
@@ -0,0 +1,30 @@
+SUMMARY = "Ninja is a small build system with a focus on speed."
+HOMEPAGE = "http://martine.github.com/ninja/"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e"
+
+DEPENDS = "re2c-native ninja-native"
+
+SRCREV = "253e94c1fa511704baeb61cf69995bbf09ba435e"
+
+SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
+
+S = "${WORKDIR}/git"
+
+do_configure[noexec] = "1"
+
+do_compile_class-native() {
+       ./configure.py --bootstrap
+}
+
+do_compile() {
+       ./configure.py
+       ninja
+}
+
+do_install() {
+       install -D -m 0755  ${S}/ninja ${D}${bindir}/ninja
+}
+
+BBCLASSEXTEND = "native nativesdk"

--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

#1 lore raw

✗ patchtest: failure for ninja: Upgrade from 1.7.2 to major release 1.8.2 (rev2)

== Series Details ==

Series: ninja: Upgrade from 1.7.2 to major release 1.8.2 (rev2)
Revision: 2
URL : https://patchwork.openembedded.org/series/10780/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at a0988c3374)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
#2 lore raw

Re: ✗ patchtest: failure for ninja: Upgrade from 1.7.2 to major release 1.8.2 (rev2)

This makes no sense to me, I rebased to master just before sending it.

-----Original Message-----
From: Patchwork [mailto:[email protected]]
Sent: Thursday, February 1, 2018 2:33 PM
To: Alejandro Enedino Hernandez Samaniego <[email protected]>
Cc: [email protected]
Subject: ✗ patchtest: failure for ninja: Upgrade from 1.7.2 to major release 1.8.2 (rev2)

== Series Details ==

Series: ninja: Upgrade from 1.7.2 to major release 1.8.2 (rev2)
Revision: 2
URL : https://patchwork.openembedded.org/series/10780/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at a0988c3374)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
#3 lore raw

Re: ✗ patchtest: failure for ninja: Upgrade from 1.7.2 to major release 1.8.2 (rev2)

Quoted 2 lines · Alejandro Enedino Hernandez Samaniego

This makes no sense to me, I rebased to master just before sending it.

Are you sure that the master you're rebasing is the actual upstream master?

Applying: ninja: Upgrade from 1.7.2 to major release 1.8.2 Using index info to reconstruct a base tree...
error: patch failed: meta/recipes-devtools/ninja/ninja_1.7.2.bb:1
error: meta/recipes-devtools/ninja/ninja_1.7.2.bb: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 ninja: Upgrade from 1.7.2 to major release 1.8.2

#4 lore raw

Re: ✗ patchtest: failure for ninja: Upgrade from 1.7.2 to major release 1.8.2 (rev2)

This is what I got:

$ git remote show origin
* remote origin
  Fetch URL: git://git.yoctoproject.org/poky
  Push  URL: git://git.yoctoproject.org/poky
  HEAD branch: master

latest commit:

bca260ef4dca87c11fc9d30b2b8a17664dc2d879 ninja: Upgrade from 1.7.2 to major release 1.8.2 385944254d0ef88bd6450a221a54cbcb40020b42 tcmode-default.inc: drop preferred version of gzip-native

Quoted 15 lines · Ross

On 2 February 2018 at 19:06, Alejandro Enedino Hernandez Samaniego <[email protected] <mailto:[email protected]>> wrote:

This makes no sense to me, I rebased to master just before sending it.

Are you sure that the master you're rebasing is the actual upstream master?

Applying: ninja: Upgrade from 1.7.2 to major release 1.8.2
Using index info to reconstruct a base tree...
error: patch failed: meta/recipes-devtools/ninja/ninja_1.7.2.bb:1 <http://ninja_1.7.2.bb:1>
error: meta/recipes-devtools/ninja/ninja_1.7.2.bb <http://ninja_1.7.2.bb>: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 ninja: Upgrade from 1.7.2 to major release 1.8.2

#5 lore raw

Re: ✗ patchtest: failure for ninja: Upgrade from 1.7.2 to major release 1.8.2 (rev2)

I might be wrong but you can check it here as well:

https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=aehs29/ninja

Quoted 35 lines · Alejandro Enedino Hernandez Samaniego

This is what I got:

$ git remote show origin
* remote origin
  Fetch URL: git://git.yoctoproject.org/poky
  Push  URL: git://git.yoctoproject.org/poky
  HEAD branch: master

latest commit:

bca260ef4dca87c11fc9d30b2b8a17664dc2d879 ninja: Upgrade from 1.7.2 to major release 1.8.2 385944254d0ef88bd6450a221a54cbcb40020b42 tcmode-default.inc: drop preferred version of gzip-native

Quoted 16 lines · Ross

On 2 February 2018 at 19:06, Alejandro Enedino Hernandez Samaniego <[email protected] <mailto:[email protected]>> wrote:

This makes no sense to me, I rebased to master just before sending it.

Are you sure that the master you're rebasing is the actual upstream master?

Applying: ninja: Upgrade from 1.7.2 to major release 1.8.2
Using index info to reconstruct a base tree...
error: patch failed: meta/recipes-devtools/ninja/ninja_1.7.2.bb:1 <http://ninja_1.7.2.bb:1>
error: meta/recipes-devtools/ninja/ninja_1.7.2.bb <http://ninja_1.7.2.bb>: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 ninja: Upgrade from 1.7.2 to major release 1.8.2

#6 lore raw

Re: ✗ patchtest: failure for ninja: Upgrade from 1.7.2 to major release 1.8.2 (rev2)

So I'm 99% sure this is Exchange tramping the mail and git not handling
that, as the patch is quoted-printable encoded. I'll pick from the
branch :)

Ross

Quoted 49 lines · Alejandro Enedino Hernandez Samaniego

I might be wrong but you can check it here as well:
https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/
log/?h=aehs29/ninja

On 02/02/2018 01:22 PM, Alejandro Enedino Hernandez Samaniego wrote:

This is what I got:

$ git remote show origin
* remote origin
  Fetch URL: git://git.yoctoproject.org/poky
  Push  URL: git://git.yoctoproject.org/poky
  HEAD branch: master

latest commit:

bca260ef4dca87c11fc9d30b2b8a17664dc2d879 ninja: Upgrade from 1.7.2 to major release 1.8.2 385944254d0ef88bd6450a221a54cbcb40020b42 tcmode-default.inc: drop preferred version of gzip-native

On 02/02/2018 12:58 PM, Burton, Ross wrote:

Quoted 2 lines · Alejandro Enedino Hernandez Samaniego

This makes no sense to me, I rebased to master just before sending it.

Are you sure that the master you're rebasing is the actual upstream master?

Applying: ninja: Upgrade from 1.7.2 to major release 1.8.2 Using index info to reconstruct a base tree...
error: patch failed: meta/recipes-devtools/ninja/ninja_1.7.2.bb:1
error: meta/recipes-devtools/ninja/ninja_1.7.2.bb: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 ninja: Upgrade from 1.7.2 to major release 1.8.2

#7 lore raw

Re: ✗ patchtest: failure for ninja: Upgrade from 1.7.2 to major release 1.8.2 (rev2)

Cool, thanks!

Alejandro

From: Burton, Ross [mailto:[email protected]]
Sent: Friday, February 2, 2018 1:35 PM
To: Alejandro Enedino Hernandez Samaniego <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] ✗ patchtest: failure for ninja: Upgrade from 1.7.2 to major release 1.8.2 (rev2)

So I'm 99% sure this is Exchange tramping the mail and git not handling that, as the patch is quoted-printable encoded. I'll pick from the branch :)

Ross

On 2 February 2018 at 21:28, Alejandro Enedino Hernandez Samaniego <[email protected]<mailto:[email protected]>> wrote:

I might be wrong but you can check it here as well:
https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=aehs29/ninja

On 02/02/2018 01:22 PM, Alejandro Enedino Hernandez Samaniego wrote:

This is what I got:

$ git remote show origin
* remote origin
  Fetch URL: git://git.yoctoproject.org/poky<http://git.yoctoproject.org/poky>
  Push  URL: git://git.yoctoproject.org/poky<http://git.yoctoproject.org/poky>
  HEAD branch: master

latest commit:

bca260ef4dca87c11fc9d30b2b8a17664dc2d879 ninja: Upgrade from 1.7.2 to major release 1.8.2 385944254d0ef88bd6450a221a54cbcb40020b42 tcmode-default.inc: drop preferred version of gzip-native

On 02/02/2018 12:58 PM, Burton, Ross wrote:
On 2 February 2018 at 19:06, Alejandro Enedino Hernandez Samaniego <[email protected]<mailto:[email protected]>> wrote:
This makes no sense to me, I rebased to master just before sending it.

Are you sure that the master you're rebasing is the actual upstream master?

Applying: ninja: Upgrade from 1.7.2 to major release 1.8.2
Using index info to reconstruct a base tree...
error: patch failed: meta/recipes-devtools/ninja/ninja_1.7.2.bb:1<http://ninja_1.7.2.bb:1>
error: meta/recipes-devtools/ninja/ninja_1.7.2.bb<http://ninja_1.7.2.bb>: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 ninja: Upgrade from 1.7.2 to major release 1.8.2

#8 lore raw
In reply to Alejandro Enedino Hernandez Samaniego
Quoted 7 lines · Alejandro Enedino Hernandez Samaniego
---
  meta/recipes-devtools/ninja/ninja_1.7.2.bb | 30 ------------------------------
  meta/recipes-devtools/ninja/ninja_1.8.2.bb | 30 ++++++++++++++++++++++++++++++
  2 files changed, 30 insertions(+), 30 deletions(-)

delete mode 100644 meta/recipes-devtools/ninja/ninja_1.7.2.bb create mode 100644 meta/recipes-devtools/ninja/ninja_1.8.2.bb

Adding the following to your .gitconfig will give you more readable patches for package upgrades:
[diff]
        renames = copies

It simplifies the delete -> creation to a rename, then shows what changed in the renamed file (SRC_URI and SRCREV).

Thanks,
Cal

Quoted 77 lines
meta/recipes-devtools/ninja/ninja_1.7.2.bb deleted +0 -30
deleted file mode 100644
index 4d3b272..0000000
@@ -1,30 +0,0 @@
-SUMMARY = "Ninja is a small build system with a focus on speed."
-HOMEPAGE = "http://martine.github.com/ninja/"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e"
-
-DEPENDS = "re2c-native ninja-native"
-
-SRCREV = "717b7b4a31db6027207588c0fb89c3ead384747b"
-
-SRC_URI = "git://github.com/martine/ninja.git;branch=release"
-UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
-
-S = "${WORKDIR}/git"
-
-do_configure[noexec] = "1"
-
-do_compile_class-native() {
-       ./configure.py --bootstrap
-}
-
-do_compile() {
-       ./configure.py
-       ninja
-}
-
-do_install() {
-       install -D -m 0755  ${S}/ninja ${D}${bindir}/ninja
-}
-
-BBCLASSEXTEND = "native nativesdk"
meta/recipes-devtools/ninja/ninja_1.8.2.bb new file +30 -1
new file mode 100644
index 0000000..c6fcfef
@@ -0,0 +1,30 @@
+SUMMARY = "Ninja is a small build system with a focus on speed."
+HOMEPAGE = "http://martine.github.com/ninja/"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e"
+
+DEPENDS = "re2c-native ninja-native"
+
+SRCREV = "253e94c1fa511704baeb61cf69995bbf09ba435e"
+
+SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
+
+S = "${WORKDIR}/git"
+
+do_configure[noexec] = "1"
+
+do_compile_class-native() {
+       ./configure.py --bootstrap
+}
+
+do_compile() {
+       ./configure.py
+       ninja
+}
+
+do_install() {
+       install -D -m 0755  ${S}/ninja ${D}${bindir}/ninja
+}
+
+BBCLASSEXTEND = "native nativesdk"
--

2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

#9 lore raw

Hey Cal,

Quoted 8 lines · Alejandro Enedino Hernandez Samaniego

Signed-off-by: Alejandro Enedino Hernandez Samaniego <[email protected]>

---
  meta/recipes-devtools/ninja/ninja_1.7.2.bb | 30 ------------------------------
  meta/recipes-devtools/ninja/ninja_1.8.2.bb | 30 ++++++++++++++++++++++++++++++
  2 files changed, 30 insertions(+), 30 deletions(-)

delete mode 100644 meta/recipes-devtools/ninja/ninja_1.7.2.bb create mode 100644 meta/recipes-devtools/ninja/ninja_1.8.2.bb

Adding the following to your .gitconfig will give you more readable patches for package upgrades:
[diff]
        renames = copies

It simplifies the delete -> creation to a rename, then shows what changed in the renamed file (SRC_URI and SRCREV).

Thanks,
Cal

Good to hear from you!, I thought git mv automatically did that, I was actually surprised it didnt but I didn’t spend too much time on that either. Thanks!

Alejandro

Quoted 78 lines
meta/recipes-devtools/ninja/ninja_1.7.2.bb deleted +0 -30
deleted file mode 100644
index 4d3b272..0000000
@@ -1,30 +0,0 @@
-SUMMARY = "Ninja is a small build system with a focus on speed."
-HOMEPAGE = "http://martine.github.com/ninja/"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e"
-
-DEPENDS = "re2c-native ninja-native"
-
-SRCREV = "717b7b4a31db6027207588c0fb89c3ead384747b"
-
-SRC_URI = "git://github.com/martine/ninja.git;branch=release"
-UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
-
-S = "${WORKDIR}/git"
-
-do_configure[noexec] = "1"
-
-do_compile_class-native() {
-       ./configure.py --bootstrap
-}
-
-do_compile() {
-       ./configure.py
-       ninja
-}
-
-do_install() {
-       install -D -m 0755  ${S}/ninja ${D}${bindir}/ninja
-}
-
-BBCLASSEXTEND = "native nativesdk"
meta/recipes-devtools/ninja/ninja_1.8.2.bb new file +29 -1
new file mode 100644
index 0000000..c6fcfef
@@ -0,0 +1,30 @@
+SUMMARY = "Ninja is a small build system with a focus on speed."
+HOMEPAGE = "http://martine.github.com/ninja/"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e"
+
+DEPENDS = "re2c-native ninja-native"
+
+SRCREV = "253e94c1fa511704baeb61cf69995bbf09ba435e"
+
+SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
+
+S = "${WORKDIR}/git"
+
+do_configure[noexec] = "1"
+
+do_compile_class-native() {
+       ./configure.py --bootstrap
+}
+
+do_compile() {
+       ./configure.py
+       ninja
+}
+
+do_install() {
+       install -D -m 0755  ${S}/ninja ${D}${bindir}/ninja }
+
+BBCLASSEXTEND = "native nativesdk"
--

2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

#10 lore raw
Quoted 3 lines · Alejandro Enedino Hernandez Samaniego

Good to hear from you!, I thought git mv automatically did that, I was actually surprised it didnt but I didn’t spend too much time on that either.

So 'git mv' is just a easy way of doing 'cp old new; git add new; git rm old'. The delete/creation -> rename magic is a heuristic at patch generation time based on how similar files are when there is a create/delete pair.

Ross