sysvinit: Remove ${B} assignment
PATCH 1/1 sysvinit: Remove ${B} assignment
In order for the VERSION variable to be set, the
top level Makefile should be used, which only
builds the code in /src anyway.
--- meta/recipes-core/sysvinit/sysvinit_2.97.bb | 1 - 1 file changed, 1 deletion(-)
meta/recipes-core/sysvinit/sysvinit_2.97.bb +0 -1
@@ -24,7 +24,6 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ SRC_URI[sha256sum] = "2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110" S = "${WORKDIR}/sysvinit-${PV}" -B = "${S}/src" inherit update-alternatives features_check DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt"
Signature · 1 line
2.28.0
Quoted 19 lines · Michael Gloff
In order for the VERSION variable to be set, the
top levelMakefileshould be used, which only
builds the code in /src anyway.Signed-off-by Michael Gloff <[email protected]>--- meta/recipes-core/sysvinit/sysvinit_2.97.bb | 1 - 1 file changed, 1 deletion(-)meta/recipes-core/sysvinit/sysvinit_2.97.bb +0
-0@@ -24,7 +24,6 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ SRC_URI[sha256sum] ="
2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110"
Quoted 5 lines
S = "${WORKDIR}/sysvinit-${PV}"
-B = "${S}/src"inherit update-alternatives
features_checkDEPENDS_append= " update-rc.d-native base-passwd virtual/crypt"
I don't understand what you're saying. Why do we need the VERSION variable to be set? Does sysvinit not support a separate build directory?
Can you rewrite the commit message so that someone who hasn't looked at the code can understand what the problem is we're fixing, why its a problem and why this is the correct solution.
Thanks!
Richard
Quoted 30 lines · Richard Purdie
Quoted 19 lines · Michael Gloff
In order for the VERSION variable to be set, the
top levelMakefileshould be used, which only
builds the code in /src anyway.Signed-off-by Michael Gloff <[email protected]>--- meta/recipes-core/sysvinit/sysvinit_2.97.bb | 1 - 1 file changed, 1 deletion(-)meta/recipes-core/sysvinit/sysvinit_2.97.bb +0
-0@@ -24,7 +24,6 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ SRC_URI[sha256sum] ="
2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110"Quoted 5 lines
S = "${WORKDIR}/sysvinit-${PV}"
-B = "${S}/src"inherit update-alternatives
features_checkDEPENDS_append= " update-rc.d-native base-passwd virtual/crypt"I don't understand what you're saying. Why do we need the VERSION variable to be set? Does sysvinit not support a separate build directory?
Quoted 8 lines
Can you rewrite the commit message so that someone who hasn't looked at the code can understand what the problem is we're fixing, why its a problem and why this is the correct solution.
Thanks!
Richard
This issue is seeing no version on boot up since the switch from 2.88:
INIT: version booting
instead of:
INIT: version 2.96 booting
with this change.
The VERSION variable that is used for all of the binaries of sysvinit is defined in the top level Makefile.
VERSION=$(shell sed -rn '1s/.*[[:blank:]]\((.*)\)[[:blank:]].*/\1/p' doc/Changelog)
I'm not sure about the separate build directory. Any tips? Thanks,
Michael
Quoted 47 lines · Michael Gloff
Quoted 31 lines · Richard Purdie
Quoted 19 lines · Michael Gloff
In order for the VERSION variable to be set, the
top levelMakefileshould be used, which only
builds the code in /src anyway.Signed-off-by Michael Gloff <[email protected]>--- meta/recipes-core/sysvinit/sysvinit_2.97.bb | 1 - 1 file changed, 1 deletion(-)meta/recipes-core/sysvinit/sysvinit_2.97.bb +0
-0@@ -24,7 +24,6 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ SRC_URI[sha256sum] ="
2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110"Quoted 5 lines
S = "${WORKDIR}/sysvinit-${PV}"
-B = "${S}/src"inherit update-alternatives
features_checkDEPENDS_append= " update-rc.d-native base-passwd virtual/crypt"I don't understand what you're saying. Why do we need the VERSION variable to be set? Does sysvinit not support a separate build directory?
Quoted 7 lines
Can you rewrite the commit message so that someone who hasn't looked at the code can understand what the problem is we're fixing, why its a problem and why this is the correct solution.
Thanks!
Richard
This issue is seeing no version on boot up since the switch from 2.88:
INIT: version booting
instead of:
INIT: version 2.96 booting
with this change.
Quoted 6 lines
The VERSION variable that is used for all of the binaries of sysvinit is defined in the top level
Makefile.VERSION=$(shell sed -rn '1s/.*[[:blank:]]\((.*)\)[[:blank:]].*/\1/p' doc/Changelog)
I'm not sure about the separate build directory. Any tips? Thanks,
A separate build directory typically only applies for components which build with autotools, cmake, etc. For components such as this one which build with handwritten Makefiles the default is to build in the source directory.
Anyway, the patch looks fine. Key point is that you want to run make in the top level source directory rather than the "src" subdirectory to ensure that variables set by the top level Makefile are correctly defined.
Quoted 3 lines
Michael
Quoted 63 lines · Andre McCurdy
Quoted 2 lines · Michael Gloff
On Sat, Sep 12, 2020 at 2:11 PM Richard Purdie <
Quoted 39 lines · [email protected]> wrote:
Quoted 31 lines · Michael Gloff
Quoted 19 lines
In order for the VERSION variable to be set, the
top levelMakefileshould be used, which only
builds the code in /src anyway.Signed-off-by Michael Gloff <[email protected]>--- meta/recipes-core/sysvinit/sysvinit_2.97.bb | 1 - 1 file changed, 1 deletion(-)meta/recipes-core/sysvinit/sysvinit_2.97.bb +0
-0@@ -24,7 +24,6 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ SRC_URI[sha256sum] ="
2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110"Quoted 5 lines
S = "${WORKDIR}/sysvinit-${PV}"
-B = "${S}/src"inherit update-alternatives
features_checkDEPENDS_append= " update-rc.d-native base-passwd virtual/crypt"I don't understand what you're saying. Why do we need the VERSION variable to be set? Does sysvinit not support a separate build directory?
Quoted 7 lines
Can you rewrite the commit message so that someone who hasn't looked at the code can understand what the problem is we're fixing, why its a problem and why this is the correct solution.
Thanks!
Richard
Quoted 7 lines
This issue is seeing no version on boot up since the switch from 2.88:
INIT: version booting
instead of:
INIT: version 2.96 booting
with this change.The VERSION variable that is used for all of the binaries of sysvinit is
defined in the top level
Makefile.Quoted 2 lines
VERSION=$(shell sed -rn '1s/.*[[:blank:]]\((.*)\)[[:blank:]].*/\1/p'
doc/Changelog)
Quoted 3 lines
I'm not sure about the separate build directory. Any tips? Thanks,
A separate build directory typically only applies for components which build with autotools, cmake, etc. For components such as this one which build with handwritten Makefiles the default is to build in the source directory.
Quoted 6 lines
Anyway, the patch looks fine. Key point is that you want to run make in the top level source directory rather than the "src" subdirectory to ensure that variables set by the top level
Makefileare correctly defined.Thanks Andre,
I kind of thought we couldn't do a separate build directory, but wanted to try.
I'll amend the commit message
Quoted 4 lines
Quoted 3 lines
Michael